diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
index db58e06..d6c9738 100644
--- a/GITHUB_SHA.h
+++ b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202212041810Z"
+#define GITHUB_SHA "devel-202212051450Z"
diff --git a/WiThrottle.cpp b/WiThrottle.cpp
index cfc4a74..019a515 100644
--- a/WiThrottle.cpp
+++ b/WiThrottle.cpp
@@ -378,7 +378,7 @@ void WiThrottle::multithrottle(RingStream * stream, byte * cmd){
     }
     //use first empty "slot" on this client's list, will be added to DCC registration list
     for (int loco=0;loco<MAX_MY_LOCO;loco++) {
-      if (myLocos[loco].throttle=='\0') { 
+      if (myLocos[loco].throttle=='\0' || myLocos[loco].cab == locoid) {
 	myLocos[loco].throttle=throttleChar;
 	myLocos[loco].cab=locoid; 
 	myLocos[loco].functionMap=DCC::getFunctionMap(locoid); 
diff --git a/version.h b/version.h
index 580bfdf..5d36187 100644
--- a/version.h
+++ b/version.h
@@ -6,6 +6,7 @@
 
 #define VERSION "4.2.7pre1"
 // 4.2.7 FIX: Static IP addr
+//       FIX: Reuse WiThrottle list entries
 // 4.2.6 FIX: Remove RAM thief
 //       FIX: ADC port 8-15 fix
 // 4.2.5 Make GETFLASHW code more universal