diff --git a/riocli/device/util.py b/riocli/device/util.py
index 0a9a5de9..0a81004b 100644
--- a/riocli/device/util.py
+++ b/riocli/device/util.py
@@ -33,6 +33,12 @@ def decorated(**kwargs: typing.Any):
             exit(1)
 
         name = kwargs.pop('device_name')
+
+        # device_name is not specified
+        if name is None:
+            f(**kwargs)
+            return
+
         guid = None
 
         if is_valid_uuid(name):