diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 2af4a1470..1ac38d955 100644
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -2,11 +2,6 @@
 
 using namespace icinga;
 
-IcingaApplication::Ptr DemoComponent::GetIcingaApplication(void)
-{
-	return static_pointer_cast<IcingaApplication>(GetApplication());
-}
-
 string DemoComponent::GetName(void) const
 {
 	return "democomponent";
diff --git a/components/demo/democomponent.h b/components/demo/democomponent.h
index 51d88336a..f4087382e 100644
--- a/components/demo/democomponent.h
+++ b/components/demo/democomponent.h
@@ -4,14 +4,12 @@
 namespace icinga
 {
 
-class DemoComponent : public Component
+class DemoComponent : public IcingaComponent
 {
 private:
 	Timer::Ptr m_DemoTimer;
 	VirtualEndpoint::Ptr m_DemoEndpoint;
 
-	IcingaApplication::Ptr GetIcingaApplication(void);
-
 	int DemoTimerHandler(const TimerEventArgs& tea);
 	int NewEndpointHandler(const NewEndpointEventArgs& neea);
 	int HelloWorldRequestHandler(const NewRequestEventArgs& nrea);