diff --git a/distrho/extra/Thread.hpp b/distrho/extra/Thread.hpp
index 8704092f..37f44970 100644
--- a/distrho/extra/Thread.hpp
+++ b/distrho/extra/Thread.hpp
@@ -37,7 +37,7 @@ protected:
      * Constructor.
      */
     Thread(const char* const threadName = nullptr) noexcept
-        : fLock(false),
+        : fLock(),
           fSignal(fLock),
           fName(threadName),
 #ifdef PTW32_DLLPORT
@@ -93,7 +93,7 @@ public:
         // check if already running
         DISTRHO_SAFE_ASSERT_RETURN(! isThreadRunning(), true);
 
-        fLock.lock();
+        const MutexLocker ml(fLock);
 
         fShouldExit = false;
 
@@ -114,7 +114,6 @@ public:
             return true;
         }
 
-        fLock.unlock();
         return false;
     }