diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index f2a2e35..554aad7 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -113,14 +113,15 @@ void setup() {
 
   if (userConfig.wifi.active) {
     LoRaSystem.getTaskManager().addAlwaysRunTask(&wifiTask);
-    LoRaSystem.getTaskManager().addTask(&otaTask);
     tcpip = true;
-  } else if (boardConfig->Type == eETH_BOARD) {
+  }
+  if (boardConfig->Type == eETH_BOARD) {
     LoRaSystem.getTaskManager().addAlwaysRunTask(&ethTask);
     tcpip = true;
   }
 
   if (tcpip) {
+    LoRaSystem.getTaskManager().addTask(&otaTask);
     LoRaSystem.getTaskManager().addTask(&ntpTask);
     if (userConfig.ftp.active) {
       LoRaSystem.getTaskManager().addTask(&ftpTask);