diff --git a/source/src/commands/shared_commands.cpp b/source/src/commands/shared_commands.cpp
index e1ff369..e040a85 100644
--- a/source/src/commands/shared_commands.cpp
+++ b/source/src/commands/shared_commands.cpp
@@ -52,7 +52,11 @@ namespace dropshell
         {
             std_autocomplete(ctx);
             if (ctx.args.size() == 1)
-                rawout << "all" << std::endl;
+            {
+                std::vector<LocalServiceInfo> services = get_server_services_info(ctx.args[0]);
+                if (services.size() > 1)
+                    rawout << "all" << std::endl;
+            }
         }
 
         // ------------------------------------------------------------------------------------------------