diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h
index c42d9767d..424330043 100644
--- a/slsDetectorSoftware/src/DetectorImpl.h
+++ b/slsDetectorSoftware/src/DetectorImpl.h
@@ -434,7 +434,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
     /** data streaming (down stream) enabled in client (zmq sckets created) */
     bool client_downstream{false};
     std::vector<std::unique_ptr<ZmqSocket>> zmqSocket;
-    volatile int numZmqRunning{0};
+    std::atomic<int> numZmqRunning{0};
 
     /** mutex to synchronize main and data processing threads */
     mutable std::mutex mp;
diff --git a/slsReceiverSoftware/src/Fifo.h b/slsReceiverSoftware/src/Fifo.h
index d07fe5fef..7166c3968 100644
--- a/slsReceiverSoftware/src/Fifo.h
+++ b/slsReceiverSoftware/src/Fifo.h
@@ -13,9 +13,10 @@
 
 #include "sls/logger.h"
 #include "sls/sls_detector_defs.h"
-
 #include "sls/CircularFifo.h"
 
+#include <atomic>
+
 namespace sls {
 
 class Fifo : private virtual slsDetectorDefs {
@@ -49,8 +50,8 @@ class Fifo : private virtual slsDetectorDefs {
     CircularFifo<char> *fifoFree;
     CircularFifo<char> *fifoStream;
     int fifoDepth;
-    volatile int status_fifoBound;
-    volatile int status_fifoFree;
+    std::atomic<int> status_fifoBound;
+    std::atomic<int> status_fifoFree;
 };
 
 } // namespace sls