diff --git a/components/codecs/src/reader.cpp b/components/codecs/src/reader.cpp
index 00df80e3cb11c393ff9f3efe3e5156202449a77e..2a2fc41453bab5bca3193dc98aa598497ad9d603 100644
--- a/components/codecs/src/reader.cpp
+++ b/components/codecs/src/reader.cpp
@@ -54,9 +54,12 @@ bool Reader::begin() {
 }*/
 
 bool Reader::read(int64_t ts, const std::function<void(const ftl::codecs::StreamPacket &, ftl::codecs::Packet &)> &f) {
-	//UNIQUE_LOCK(mtx_, lk);
+	#ifdef DEBUG_MUTEX
+	UNIQUE_LOCK(mtx_, lk);
+	#else
 	std::unique_lock<std::mutex> lk(mtx_, std::defer_lock);
 	if (!lk.try_lock()) return true;
+	#endif
 
 	// Check buffer first for frames already read
 	for (auto i = data_.begin(); i != data_.end();) {
diff --git a/components/streams/src/filestream.cpp b/components/streams/src/filestream.cpp
index 62256438b3e8c9951c08a97de3defe67d58bd374..a9003dd04c3d5c6747d4c171e690b6ceddf2e3a5 100644
--- a/components/streams/src/filestream.cpp
+++ b/components/streams/src/filestream.cpp
@@ -65,9 +65,12 @@ bool File::tick(int64_t ts) {
 		return false;
 	}
 
-	//UNIQUE_LOCK(mtx_, lk);
+	#ifdef DEBUG_MUTEX
+	UNIQUE_LOCK(mutex_, lk);
+	#else
 	std::unique_lock<std::mutex> lk(mutex_, std::defer_lock);
 	if (!lk.try_lock()) return true;
+	#endif
 
 	if (jobs_ > 0) {
 		//LOG(ERROR) << "STILL HAS JOBS";