diff --git a/ATEM_tally_light/ATEM_tally_light.ino b/ATEM_tally_light/ATEM_tally_light.ino
index 7510433..b9fd21e 100644
--- a/ATEM_tally_light/ATEM_tally_light.ino
+++ b/ATEM_tally_light/ATEM_tally_light.ino
@@ -579,7 +579,11 @@ void handleRoot() {
         case WL_DISCONNECTED:
             html += "Station mode disabled";
             break;
+#if ESP32
+        default:
+#else
         case -1:
+#endif
             html += "Timeout";
             break;
     }
diff --git a/ATEM_tally_test_server/ATEM_tally_test_server.ino b/ATEM_tally_test_server/ATEM_tally_test_server.ino
index d3e882b..5797d84 100644
--- a/ATEM_tally_test_server/ATEM_tally_test_server.ino
+++ b/ATEM_tally_test_server/ATEM_tally_test_server.ino
@@ -513,7 +513,11 @@ void handleRoot() {
         case WL_DISCONNECTED:
             html += "Station mode disabled";
             break;
+#if ESP32
+        default:
+#else
         case -1:
+#endif
             html += "Timeout";
             break;
     }
diff --git a/libraries/ATEMmin/ATEMmin.h b/libraries/ATEMmin/ATEMmin.h
index a4106bd..2456326 100644
--- a/libraries/ATEMmin/ATEMmin.h
+++ b/libraries/ATEMmin/ATEMmin.h
@@ -32,7 +32,12 @@ you can keep a clear conscience: http://skaarhoj.com/about/licenses/
 
 #include "Arduino.h"
 #include "ATEMbase.h"
-#include "EthernetUdp.h"
+
+#if defined ESP8266 || defined ESP32
+#include <WifiUDP.h>
+#else
+#include <EthernetUdp.h>
+#endif
 
 
 class ATEMmin : public ATEMbase