diff --git a/clients/jack_client.cpp b/clients/jack_client.cpp
index 682d873b..619cb9d7 100644
--- a/clients/jack_client.cpp
+++ b/clients/jack_client.cpp
@@ -273,7 +273,7 @@ int main(int argc, char** argv)
     signal(SIGQUIT, done);
 
     while (!shouldClose){
-#ifdef DEBUG
+#ifndef NDEBUG
         std::cout << "Allocated buffers: " << synth.getAllocatedBuffers() << '\n';
         std::cout << "Total size: " << synth.getAllocatedBytes()  << '\n';
 #endif
diff --git a/lv2/sfizz.c b/lv2/sfizz.c
index 749dc9a9..90df55eb 100644
--- a/lv2/sfizz.c
+++ b/lv2/sfizz.c
@@ -578,7 +578,7 @@ run(LV2_Handle instance, uint32_t sample_count)
         }
     }
 
-#ifdef DEBUG
+#ifndef NDEBUG
     // Log the buffer usage
     self->sample_counter += (int)sample_count;
     if (self->sample_counter > LOG_SAMPLE_COUNT)
diff --git a/src/sfizz/Buffer.h b/src/sfizz/Buffer.h
index 60b87d3c..81df042f 100644
--- a/src/sfizz/Buffer.h
+++ b/src/sfizz/Buffer.h
@@ -44,7 +44,7 @@ public:
     BufferCounter() = default;
     ~BufferCounter()
     {
-#ifdef DEBUG
+#ifndef NDEBUG
         std::cout << "Remaining buffers on destruction: " << numBuffers << '\n';
         std::cout << "Total size: " << bytes << '\n';
 #endif