diff --git a/src/blackcore/afv/clients/afvclient.h b/src/blackcore/afv/clients/afvclient.h
index ed2808d96..6c511931d 100644
--- a/src/blackcore/afv/clients/afvclient.h
+++ b/src/blackcore/afv/clients/afvclient.h
@@ -429,14 +429,14 @@ namespace BlackCore::Afv::Clients
 
         std::atomic_bool m_connectedWithContext { false };
 
-        mutable QMutex m_mutex                { QMutex::Recursive };
-        mutable QMutex m_mutexInputStream     { QMutex::Recursive };
-        mutable QMutex m_mutexOutputStream    { QMutex::Recursive };
-        mutable QMutex m_mutexTransceivers    { QMutex::Recursive };
-        mutable QMutex m_mutexCallsign        { QMutex::Recursive };
-        mutable QMutex m_mutexConnection      { QMutex::Recursive };
-        mutable QMutex m_mutexVolume          { QMutex::Recursive };
-        mutable QMutex m_mutexSampleProviders { QMutex::Recursive };
+        mutable QRecursiveMutex m_mutex;
+        mutable QRecursiveMutex m_mutexInputStream;
+        mutable QRecursiveMutex m_mutexOutputStream;
+        mutable QRecursiveMutex m_mutexTransceivers;
+        mutable QRecursiveMutex m_mutexCallsign;
+        mutable QRecursiveMutex m_mutexConnection;
+        mutable QRecursiveMutex m_mutexVolume;
+        mutable QRecursiveMutex m_mutexSampleProviders;
 
     };
 } // ns
diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h
index bf743088a..cecd808d5 100644
--- a/src/blackmisc/datacache.h
+++ b/src/blackmisc/datacache.h
@@ -169,7 +169,7 @@ namespace BlackMisc
         void sessionValue(const QString &key);
 
     private:
-        mutable QMutex m_mutex { QMutex::Recursive };
+        mutable QRecursiveMutex m_mutex;
         bool m_updateInProgress = false;
         bool m_found = false;
         bool m_pendingRead = false;
diff --git a/src/blackmisc/sharedstate/datalinkdbus.h b/src/blackmisc/sharedstate/datalinkdbus.h
index cd54c93a7..1aeae7c31 100644
--- a/src/blackmisc/sharedstate/datalinkdbus.h
+++ b/src/blackmisc/sharedstate/datalinkdbus.h
@@ -90,7 +90,7 @@ namespace BlackMisc
             CIdentifier m_identifier = CIdentifier::anonymous();
 
             QMap<QString, Channel> m_channels;
-            mutable QMutex m_channelsMutex { QMutex::Recursive };
+            mutable QRecursiveMutex m_channelsMutex;
         };
     }
 }
diff --git a/src/blackmisc/sharedstate/datalinklocal.h b/src/blackmisc/sharedstate/datalinklocal.h
index 3dcba0f0f..121345f99 100644
--- a/src/blackmisc/sharedstate/datalinklocal.h
+++ b/src/blackmisc/sharedstate/datalinklocal.h
@@ -54,7 +54,7 @@ namespace BlackMisc::SharedState
         Channel &getChannel(const QObject *object);
 
         QMap<QString, Channel> m_channels;
-        mutable QMutex m_channelsMutex { QMutex::Recursive };
+        mutable QRecursiveMutex m_channelsMutex;
     };
 }
 
diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h
index 0b3899e63..f8c9d94a3 100644
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -299,7 +299,7 @@ namespace BlackMisc
         void markAllAsSaved(const QStringList &keys);
 
         //! Mutex protecting operations which are critical on m_elements.
-        mutable QMutex m_mutex { QMutex::Recursive };
+        mutable QRecursiveMutex m_mutex;
 
     protected:
         //! Synchronously return a current value.
diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h
index 3a5f0f0d8..d868aaeb6 100644
--- a/src/blackmisc/worker.h
+++ b/src/blackmisc/worker.h
@@ -184,7 +184,7 @@ namespace BlackMisc
 
         bool m_started = false;
         bool m_finished = false;
-        mutable QMutex m_finishedMutex { QMutex::Recursive };
+        mutable QRecursiveMutex m_finishedMutex;
         static QSet<CWorkerBase *> s_allWorkers;
     };
 
diff --git a/src/blacksound/threadedtonepairplayer.h b/src/blacksound/threadedtonepairplayer.h
index 764d6631e..1d25a8381 100644
--- a/src/blacksound/threadedtonepairplayer.h
+++ b/src/blacksound/threadedtonepairplayer.h
@@ -75,7 +75,7 @@ namespace BlackSound
         QBuffer       m_buffer;
         QAudioFormat  m_audioFormat;
         QMap<CTonePair, QByteArray> m_tonePairCache;
-        mutable QMutex m_mutex { QMutex::Recursive };
+        mutable QRecursiveMutex m_mutex;
     };
 } // ns