diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index e101a042f..d7637c3b1 100755
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -330,9 +330,11 @@ void qDrawPlot::SetDataCallBack(bool enable) {
     FILE_LOG(logINFO) << "Setting data call back to " << std::boolalpha << enable << std::noboolalpha;
     if (enable) {
         isPlot = true;
+        det->setRxZmqDataStream(true);
         det->registerDataCallback(&(GetDataCallBack), this); 
     } else {
         isPlot = false;
+        det->setRxZmqDataStream(false);
         det->registerDataCallback(nullptr, this);
     }
   
diff --git a/slsDetectorSoftware/src/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp
index edd540ffe..8aa88b50f 100755
--- a/slsDetectorSoftware/src/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/src/multiSlsDetector.cpp
@@ -958,15 +958,7 @@ void multiSlsDetector::registerDataCallback(
     void *pArg) {
     dataReady = userCallback;
     pCallbackArg = pArg;
-    if (Parallel(&slsDetector::getUseReceiverFlag, {}).squash(false)) {
-        if (dataReady == nullptr) {
-            enableDataStreamingToClient(0);
-            Parallel(&slsDetector::enableDataStreamingFromReceiver, {}, 0);
-        } else {
-            enableDataStreamingToClient(1);
-            Parallel(&slsDetector::enableDataStreamingFromReceiver, {}, 1);
-        }
-    }
+    enableDataStreamingToClient(dataReady == nullptr ? 0 : 1); 
 }
 
 double multiSlsDetector::setTotalProgress() {
diff --git a/slsDetectorSoftware/src/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp
index 0cb510332..2c5eaa90a 100755
--- a/slsDetectorSoftware/src/slsDetector.cpp
+++ b/slsDetectorSoftware/src/slsDetector.cpp
@@ -1164,7 +1164,7 @@ void slsDetector::stopAcquisition() {
 
 void slsDetector::sendSoftwareTrigger() {
     FILE_LOG(logDEBUG1) << "Sending software trigger";
-    sendToDetector(F_SOFTWARE_TRIGGER);
+    sendToDetectorStop(F_SOFTWARE_TRIGGER);
     FILE_LOG(logDEBUG1) << "Sending software trigger successful";
 }