diff --git a/ATEM_tally_light/ATEM_tally_light.cpp b/ATEM_tally_light/ATEM_tally_light.cpp
index 40e9d7f..bd59e52 100644
--- a/ATEM_tally_light/ATEM_tally_light.cpp
+++ b/ATEM_tally_light/ATEM_tally_light.cpp
@@ -409,17 +409,6 @@ void loop() {
             for (int i = 0; i < tallySources; i++) {
                 tallyServer.setTallyFlag(i, atemSwitcher.getTallyByIndexTallyFlags(i));
             }
-
-            //Switch state if ATEM connection is lost...
-            if (!atemSwitcher.isConnected()) { // will return false if the connection was lost
-                Serial.println("------------------------");
-                Serial.println("Connection to Switcher lost...");
-                changeState(STATE_CONNECTING_TO_SWITCHER);
-
-                //Reset tally server's tally flags, so clients turn off their lights.
-                tallyServer.resetTallyFlags();
-            }
-        
 #endif
 
             //Handle Tally Server
@@ -433,6 +422,18 @@ void loop() {
             color = getLedColor(settings.tallyModeLED2, settings.tallyNo);
             setLED2(color);
 
+#ifndef TALLY_TEST_SERVER
+            //Switch state if ATEM connection is lost...
+            if (!atemSwitcher.isConnected()) { // will return false if the connection was lost
+                Serial.println("------------------------");
+                Serial.println("Connection to Switcher lost...");
+                changeState(STATE_CONNECTING_TO_SWITCHER);
+
+                //Reset tally server's tally flags, so clients turn off their lights.
+                tallyServer.resetTallyFlags();
+            }
+#endif
+
             //Commented out for userst without batteries - Also timer is not done properly
             // batteryLoop();
             break;
diff --git a/platformio.ini b/platformio.ini
index a75951d..1974d16 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,8 +10,8 @@
 
 [platformio]
 default_envs = ESP8266, ESP8266_test_server, ESP32, ESP32_test_server, ESP32_C3, ESP32_S2, ESP32_S3, ESP32_C3_test_server, ESP32_S2_test_server, ESP32_S3_test_server
-src_dir = $PROJECT_DIR/ATEM_tally_light
-lib_dir = $PROJECT_DIR/libraries
+src_dir = ${PROJECT_DIR}/ATEM_tally_light
+lib_dir = ${PROJECT_DIR}/libraries
 
 [env]
 framework = arduino
diff --git a/requirements.txt b/requirements.txt
index 6eb682c..48c1c18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-platformio==6.1.11
\ No newline at end of file
+platformio==6.1.13
\ No newline at end of file