diff --git a/sdk/include/reactos/libs/sound/mmebuddy_debug.h b/sdk/include/reactos/libs/sound/mmebuddy_debug.h
index 1a18d5b58bf..92d72009db5 100644
--- a/sdk/include/reactos/libs/sound/mmebuddy_debug.h
+++ b/sdk/include/reactos/libs/sound/mmebuddy_debug.h
@@ -13,7 +13,7 @@
         MessageBox(0, dbg_popup_msg, dbg_popup_title, MB_OK | MB_TASKMODAL); \
     }
 
-#ifndef NDEBUG
+#if DBG && !defined(NDEBUG)
     #define SND_ERR(...) \
         { \
             WCHAR dbg_popup_msg[1024]; \
@@ -55,7 +55,6 @@
                 CurrDumpHdr = CurrDumpHdr->lpNext; \
             } \
         }
-
 #else
     #define SND_ERR(...) do {} while ( 0 )
     #define SND_WARN(...) do {} while ( 0 )
diff --git a/sdk/lib/drivers/sound/mmebuddy/CMakeLists.txt b/sdk/lib/drivers/sound/mmebuddy/CMakeLists.txt
index 099000988e8..e0e80efbea1 100644
--- a/sdk/lib/drivers/sound/mmebuddy/CMakeLists.txt
+++ b/sdk/lib/drivers/sound/mmebuddy/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 add_definitions(
-    -DUNICODE -D_UNICODE
-    -DNDEBUG=1)
+    -DUNICODE -D_UNICODE)
+if(DBG)
+    add_compile_definitions(NDEBUG)
+endif()
 
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)
 
diff --git a/sdk/lib/drivers/sound/mmixer/CMakeLists.txt b/sdk/lib/drivers/sound/mmixer/CMakeLists.txt
index 9347f050642..2aa8637687a 100644
--- a/sdk/lib/drivers/sound/mmixer/CMakeLists.txt
+++ b/sdk/lib/drivers/sound/mmixer/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 add_definitions(
-    -DUNICODE -D_UNICODE
-    -DNDEBUG=1)
+    -DUNICODE -D_UNICODE)
+if(DBG)
+    add_compile_definitions(NDEBUG)
+endif()
 
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/sound)