diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 6a14301..b4262f4 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -843,7 +843,7 @@
         return 1;
     }
 
-    if (!strcmp(*argv, "devices")) {
+    if (argc > 0 && !strcmp(*argv, "devices")) {
         skip(1);
         list_devices();
         return 0;