diff --git a/src/GlobalVars.h b/src/GlobalVars.h
index 411abf8ed..ff6fe8748 100644
--- a/src/GlobalVars.h
+++ b/src/GlobalVars.h
@@ -41,6 +41,8 @@ extern SlimeVR::Configuration::Configuration configuration;
 extern SlimeVR::Sensors::SensorManager sensorManager;
 extern SlimeVR::Network::Manager networkManager;
 extern SlimeVR::Network::Connection networkConnection;
+#if USE_REMOTE_COMMAND
 extern SlimeVR::Network::RemoteCmd networkRemoteCmd;
+#endif
 
 #endif
diff --git a/src/debug.h b/src/debug.h
index 1d15733b9..82e5bbd97 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -47,6 +47,7 @@
 
 #define serialDebug false // Set to true to get Serial output for debugging
 #define serialBaudRate 115200
+#define USE_REMOTE_COMMAND true
 #define LED_INTERVAL_STANDBY 10000
 #define PRINT_STATE_EVERY_MS 60000
 
diff --git a/src/logging/Logger.cpp b/src/logging/Logger.cpp
index dbad9a5fa..8fc37fecc 100644
--- a/src/logging/Logger.cpp
+++ b/src/logging/Logger.cpp
@@ -78,10 +78,12 @@ namespace SlimeVR
 
       Serial.printf("[%-5s] [%s] %s\n", levelToString(level), buf, buffer);
 
+      #if USE_REMOTE_COMMAND
       if (getRemoteCmdConncted())
 	  {
         getRemoteCmdStream().printf("[%-5s] [%s] %s\n", levelToString(level), buf, buffer);
       }
+      #endif
     }
   }
 }
diff --git a/src/logging/Logger.h b/src/logging/Logger.h
index 98317805f..ba51eb204 100644
--- a/src/logging/Logger.h
+++ b/src/logging/Logger.h
@@ -100,6 +100,7 @@ namespace SlimeVR
 
         Serial.println();
 
+        #if USE_REMOTE_COMMAND
         if (getRemoteCmdConncted())
 		{
 		  Stream & networkStream = getRemoteCmdStream();
@@ -112,6 +113,7 @@ namespace SlimeVR
 
           networkStream.println();
         }
+        #endif
       }
 
       const char *const m_Prefix;
diff --git a/src/main.cpp b/src/main.cpp
index 488e45548..86bc32841 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,7 +43,9 @@ SlimeVR::Status::StatusManager statusManager;
 SlimeVR::Configuration::Configuration configuration;
 SlimeVR::Network::Manager networkManager;
 SlimeVR::Network::Connection networkConnection;
+#if USE_REMOTE_COMMAND
 SlimeVR::Network::RemoteCmd networkRemoteCmd;
+#endif
 
 int sensorToCalibrate = -1;
 bool blinking = false;
diff --git a/src/network/manager.cpp b/src/network/manager.cpp
index e71b2d99a..213685289 100644
--- a/src/network/manager.cpp
+++ b/src/network/manager.cpp
@@ -43,11 +43,15 @@ void Manager::update() {
 	if (!wasConnected) {
 		// WiFi was reconnected, rediscover the server and reconnect
 		networkConnection.reset();
+		#ifdef USE_REMOTE_COMMAND
 		networkRemoteCmd.reset();
+		#endif
 	}
 
 	networkConnection.update();
+	#ifdef USE_REMOTE_COMMAND
 	networkRemoteCmd.update();
+	#endif
 }
 
 }  // namespace Network
diff --git a/src/serial/serialcommands.cpp b/src/serial/serialcommands.cpp
index 33972b374..af8dc9435 100644
--- a/src/serial/serialcommands.cpp
+++ b/src/serial/serialcommands.cpp
@@ -209,11 +209,13 @@ namespace SerialCommands {
 
     void update() {
         cmdCallbacks.updateCmdProcessing(&cmdParser, &cmdBuffer, &Serial);
+        #if USE_REMOTE_COMMAND
         if (networkRemoteCmd.isConnected()) {
 			Stream & networkStream = networkRemoteCmd.getStream();
 			while (networkStream.available()) {
 				cmdCallbacks.updateCmdProcessing(&cmdParser, &cmdBuffer, &networkStream);
 			}
 		}
+        #endif
     }
 }