diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp
index d6659aa38..5f32adf2d 100644
--- a/src/gui/components/cc_timer.cpp
+++ b/src/gui/components/cc_timer.cpp
@@ -143,10 +143,12 @@ bool CComponentsTimer::startTimer()
 bool CComponentsTimer::stopTimer()
 {
 	tm_enable = false;
-	OnTimer.clear();
 	stopThread();
-	if(tm_thread == 0)
+	if(tm_thread == 0){
+		if (!OnTimer.empty())
+			OnTimer.clear();
 		return true;
+	}
 
 	return false;
 }