diff --git a/cd_utils/cdutils_core.cpp b/cd_utils/cdutils_core.cpp
index 9c95baa..ba74c02 100644
--- a/cd_utils/cdutils_core.cpp
+++ b/cd_utils/cdutils_core.cpp
@@ -212,7 +212,8 @@ void CDCore::init(const PIString & configuration, bool pult) {
 
 
 void CDCore::stop() {
-	x_timer.stop(true);
+	x_timer.stop();
+	x_timer.waitForFinish(1000);
 	connection.stop();
 }
 
@@ -231,7 +232,8 @@ void CDCore::startX(double freq) {
 
 
 void CDCore::stopX() {
-	x_timer.stop(true);
+	x_timer.stop();
+	x_timer.waitForFinish(1000);
 }