diff --git a/osdep/Phy.hpp b/osdep/Phy.hpp
index 11cbe4c05..1d2c8b035 100644
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@@ -207,6 +207,7 @@ template <typename HANDLER_PTR_TYPE> class Phy {
 		_whackSendSocket = pipes[1];
 		_noDelay = noDelay;
 		_noCheck = noCheck;
+		FD_SET(_whackReceiveSocket, &_readfds);
 	}
 
 	~Phy()
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 227b575f7..e7a91aa2d 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1014,12 +1014,12 @@ class OneServiceImpl : public OneService {
 		curl_global_cleanup();
 #endif
 
-		_controlPlane.stop();
 		if (_serverThreadRunning) {
+			_controlPlane.stop();
 			_serverThread.join();
 		}
-		_controlPlaneV6.stop();
 		if (_serverThreadRunningV6) {
+			_controlPlaneV6.stop();
 			_serverThreadV6.join();
 		}
 		_rxPacketVector_m.lock();