diff --git a/platypush/plugins/switch/wemo/__init__.py b/platypush/plugins/switch/wemo/__init__.py
index 00b8cec1..08ededf5 100644
--- a/platypush/plugins/switch/wemo/__init__.py
+++ b/platypush/plugins/switch/wemo/__init__.py
@@ -109,7 +109,7 @@ class SwitchWemoPlugin(SwitchPlugin):
     def status(self, device=None, *args, **kwargs):
         devices = {device: device} if device else self._devices.copy()
 
-        return [
+        ret = [
             {
                 'id': addr,
                 'ip': addr,
@@ -119,6 +119,8 @@ class SwitchWemoPlugin(SwitchPlugin):
             for (name, addr) in self._devices.items()
         ]
 
+        return ret[0] if device else ret
+
     @action
     def on(self, device: str, **kwargs):
         """