diff --git a/platypush/message/request/__init__.py b/platypush/message/request/__init__.py
index 14db241d27..1f21d422ef 100644
--- a/platypush/message/request/__init__.py
+++ b/platypush/message/request/__init__.py
@@ -49,7 +49,7 @@ class Request(Message):
     def build(cls, msg):
         msg = super().parse(msg)
         args = {
-            'target' : msg['target'],
+            'target' : msg.get('target', Config.get('device_id')),
             'action' : msg['action'],
             'args'   : msg['args'] if 'args' in msg else {},
         }