diff --git a/cli.cpp b/cli.cpp
index 96d7c3ed..ad3e2705 100644
--- a/cli.cpp
+++ b/cli.cpp
@@ -995,7 +995,6 @@ int ProcessOptions(int argc, char* argv[], Options* options, std::vector<RGBCont
             if((option == "--localconfig")
              ||(option == "--nodetect")
              ||(option == "--noautoconnect")
-             ||(option == "--client")
              ||(option == "--server")
              ||(option == "--gui")
              ||(option == "--i2c-tools" || option == "--yolo")
@@ -1016,6 +1015,7 @@ int ProcessOptions(int argc, char* argv[], Options* options, std::vector<RGBCont
             else if((option == "--server-port")
                   ||(option == "--loglevel")
                   ||(option == "--config")
+                  ||(option == "--client")
                   ||(option == "--autostart-enable"))
             {
                 /*-------------------------------------------------*\
@@ -1308,6 +1308,7 @@ unsigned int cli_pre_detection(int argc, char* argv[])
 
             ResourceManager::get()->GetClients().push_back(client);
 
+            cfg_args++;
             arg_index++;
         }