diff --git a/libraries/SondeLib/Sonde.cpp b/libraries/SondeLib/Sonde.cpp
index 6106642..01cc963 100644
--- a/libraries/SondeLib/Sonde.cpp
+++ b/libraries/SondeLib/Sonde.cpp
@@ -383,7 +383,14 @@ void Sonde::setup() {
 		Serial.print("Invalid rxtask.currentSonde: ");
 		Serial.println(rxtask.currentSonde);
 		rxtask.currentSonde = 0;
-	}
+    for(int i=0; i<config.maxsonde - 1; i++) {
+      if(!sondeList[rxtask.currentSonde].active) {
+        rxtask.currentSonde++;
+        if(rxtask.currentSonde>=nSonde) rxtask.currentSonde=0;
+      }
+    }
+    sonde.currentSonde = rxtask.currentSonde;
+  }
 
 	// update receiver config
 	Serial.print("\nSonde::setup() on sonde index ");