diff --git a/pyvoltha/adapters/kafka/core_proxy.py b/pyvoltha/adapters/kafka/core_proxy.py
index e99d00f..88cf278 100644
--- a/pyvoltha/adapters/kafka/core_proxy.py
+++ b/pyvoltha/adapters/kafka/core_proxy.py
@@ -178,7 +178,7 @@
                 encoded[k] = b_proto
         return encoded
 
-    @ContainerProxy.wrap_request(None)
+    @ContainerProxy.wrap_request(Device)
     @inlineCallbacks
     def child_device_detected(self,
                               parent_device_id,