diff --git a/server/src/objectcontrol.c b/server/src/objectcontrol.c
index 843f9bc39..adcca89e9 100644
--- a/server/src/objectcontrol.c
+++ b/server/src/objectcontrol.c
@@ -844,7 +844,6 @@ void objectcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
 										 "[ObjectControl] Was not able to connect to object, [IP: %s] [PORT: %d], retry in %d sec...",
 										 object_address_name[iIndex], object_tcp_port[iIndex],
 										 (!(1 & DisconnectU8)) * 3);
-								(void)sleep(3);	// TODO: Move this to the rest of the sleep operations? Also, remove the hardcoded 3
 								break;
 							case EADDRINUSE:
 								util_error("[ObjectControl] Local address/port already in use");
@@ -878,7 +877,7 @@ void objectcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
 
 						}
 
-					} while (iResult < 0 && DisconnectU8 == 0);
+					} while (iExit == 0 && iResult < 0 && DisconnectU8 == 0);
 
 					if (iResult >= 0) {
 						/* Send OSEM command in mq so that we get some information like GPSweek, origin (latitude,logitude,altitude in gps coordinates) */