diff --git a/lib/demo/demo.cpp b/lib/demo/demo.cpp
index 6ecd8008b..f837546c2 100644
--- a/lib/demo/demo.cpp
+++ b/lib/demo/demo.cpp
@@ -59,10 +59,10 @@ void Demo::DemoTimerHandler(void)
 	}
 }
 
-Value Demo::DemoMessageHandler(const MessageOrigin& origin, const Dictionary::Ptr&)
+Value Demo::DemoMessageHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr&)
 {
 	Log(LogInformation, "Demo")
-	    << "Got demo message from '" << origin.FromClient->GetEndpoint()->GetName() << "'";
+	    << "Got demo message from '" << origin->FromClient->GetEndpoint()->GetName() << "'";
 
 	return Empty;
 }
diff --git a/lib/demo/demo.hpp b/lib/demo/demo.hpp
index 679cfe516..c74927019 100644
--- a/lib/demo/demo.hpp
+++ b/lib/demo/demo.hpp
@@ -38,7 +38,7 @@ public:
 
 	virtual void Start(void);
 
-	static Value DemoMessageHandler(const MessageOrigin& origin, const Dictionary::Ptr& params);
+	static Value DemoMessageHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
 
 
 private: