diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp
index 4283a6f14..11fa328f3 100644
--- a/src/gui/components/cc_timer.cpp
+++ b/src/gui/components/cc_timer.cpp
@@ -75,7 +75,7 @@ void CComponentsTimer::runSharedTimerAction()
 	//start loop
 	tn = "cc:"+name;
 	set_threadname(tn.c_str());
-	while(tm_enable && tm_interval > 0) {
+	while(tm_enable && tm_interval > 0 && !OnTimer.empty()) {
 		tm_mutex.lock();
 		OnTimer();
 		if (!tm_enable_nano){