diff --git a/core/SipCtrlInterface.cpp b/core/SipCtrlInterface.cpp
index 5c2524f4..7683da56 100644
--- a/core/SipCtrlInterface.cpp
+++ b/core/SipCtrlInterface.cpp
@@ -448,6 +448,9 @@ void _SipCtrlInterface::cleanup()
 	tcp_sockets = NULL;
 	nr_tcp_sockets = 0;
     }
+
+    wheeltimer::instance()->stop();
+    wheeltimer::instance()->join();
 }
 
 int _SipCtrlInterface::send(const AmSipReply &rep, const string& dialog_id,