diff --git a/src/client.cpp b/src/client.cpp
index fb9bab5478..b98a60c383 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -631,14 +631,12 @@ bool CClient::GetAndResetbJitterBufferOKFlag()
     // get the socket buffer put status flag and reset it
     const bool bSocketJitBufOKFlag = Socket.GetAndResetbJitterBufferOKFlag();
 
-    if ( !bJitterBufferOK )
+    // atomically read our own get status flag and reset it to OK
+    if ( !bJitterBufferOK.exchange ( true ) )
     {
         // our jitter buffer get status is not OK so the overall status of the
         // jitter buffer is also not OK (we do not have to consider the status
         // of the socket buffer put status flag)
-
-        // reset flag before returning the function
-        bJitterBufferOK = true;
         return false;
     }
 
diff --git a/src/client.h b/src/client.h
index fb77930723..c133d8d854 100644
--- a/src/client.h
+++ b/src/client.h
@@ -51,6 +51,7 @@
 #include <QString>
 #include <QDateTime>
 #include <QMutex>
+#include <atomic>
 #ifdef USE_OPUS_SHARED_LIB
 #    include "opus/opus_custom.h"
 #else
@@ -431,9 +432,9 @@ class CClient : public QObject
     bool        bEnableAudioAlerts;
     bool        bEnableOPUS64;
 
-    bool   bJitterBufferOK;
-    bool   bMuteMeInPersonalMix;
-    QMutex MutexDriverReinit;
+    std::atomic<bool> bJitterBufferOK;
+    bool              bMuteMeInPersonalMix;
+    QMutex            MutexDriverReinit;
 
     // server settings
     int  iServerSockBufNumFrames;
diff --git a/src/socket.cpp b/src/socket.cpp
index 0a83922342..b02b3a655a 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -518,17 +518,10 @@ void CSocket::SendPacket ( const CVector<uint8_t>& vecbySendBuf, const CHostAddr
 
 bool CSocket::GetAndResetbJitterBufferOKFlag()
 {
-    // check jitter buffer status
-    if ( !bJitterBufferOK )
-    {
-        // reset flag and return "not OK" status
-        bJitterBufferOK = true;
-        return false;
-    }
-
-    // the buffer was OK, we do not have to reset anything and just return the
-    // OK status
-    return true;
+    // atomically read the jitter buffer status and reset it to OK so that a
+    // "not OK" set by the socket thread between a separate read and reset
+    // cannot be lost
+    return bJitterBufferOK.exchange ( true );
 }
 
 void CSocket::OnDataReceived()
diff --git a/src/socket.h b/src/socket.h
index 4cd80bb1a2..3a08e85ae7 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -50,6 +50,7 @@
 #include <QThread>
 #include <QMutex>
 #include <vector>
+#include <atomic>
 #include "global.h"
 #include "protocol.h"
 #include "util.h"
@@ -124,7 +125,7 @@ class CSocket : public QObject
 
     bool bIsClient;
 
-    bool bJitterBufferOK;
+    std::atomic<bool> bJitterBufferOK;
 
     // This is a reference to CClient::bIPv6Available or CServer::bIPv6Available,
     // to inform the Client or Server which type of socket was created at startup.
diff --git a/src/sound/soundbase.h b/src/sound/soundbase.h
index ddf68e3275..32c727f999 100644
--- a/src/sound/soundbase.h
+++ b/src/sound/soundbase.h
@@ -49,6 +49,7 @@
 #include <QThread>
 #include <QString>
 #include <QMutex>
+#include <atomic>
 #ifndef HEADLESS
 #    include <QMessageBox>
 #endif
@@ -193,10 +194,10 @@ class CSoundBase : public QThread
         ( *fpProcessCallback ) ( psData, pProcessCallbackArg );
     }
 
-    bool   bRun;
-    bool   bCallbackEntered;
-    QMutex MutexAudioProcessCallback;
-    QMutex MutexDevProperties;
+    std::atomic<bool> bRun;
+    std::atomic<bool> bCallbackEntered;
+    QMutex            MutexAudioProcessCallback;
+    QMutex            MutexDevProperties;
 
     QString                strSystemDriverTechniqueName;
     int                    iCtrlMIDIChannel;
diff --git a/src/util.h b/src/util.h
index 1185c56936..6e8645ae8d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -47,6 +47,7 @@
 #pragma once
 #include <vector>
 #include <algorithm>
+#include <atomic>
 #ifdef _WIN32
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
@@ -1352,11 +1353,11 @@ class CHighPrecisionTimer : public QThread
 protected:
     virtual void run();
 
-    bool     bRun;
+    std::atomic<bool> bRun;
 
 #    if defined( __APPLE__ ) || defined( __MACOSX )
-    uint64_t Delay;
-    uint64_t NextEnd;
+    uint64_t          Delay;
+    uint64_t          NextEnd;
 #    else
     long     Delay;
     timespec NextEnd;