diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
index 746f7a6..a971e81 100644
--- a/Source/PluginProcessor.cpp
+++ b/Source/PluginProcessor.cpp
@@ -576,6 +576,9 @@ void JaySynthAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer
 	for (i=0; i <numSamples; i++)
 		buf[1][i] = (synth_float_t)buf2[i] * synth_gain;
 
+	m_limiter_active = 0;
+
+#ifdef WITH_LIMITER		
 	// Limiter
 	limiter_ar = 5.0/(SYNTH_LIMITER_RISE_TIME*m_fs);
 	limiter_af = 5.0/(SYNTH_LIMITER_FALL_TIME*m_fs);
@@ -596,13 +599,13 @@ void JaySynthAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer
 		limiter_env[i] = m_limiter_env;
 	}
 
-	m_limiter_active = 0;
 	for (i=0; i <numSamples; i++)
 	{
 		limiter_gain[i] = jsy_min(1.0, 1.0/(limiter_env[i] + 1.0e-6));
 		if (limiter_gain[i] < 1.0)
 		{
 			m_limiter_active = 1;
+			break;
 		}
 	}
 
@@ -611,6 +614,7 @@ void JaySynthAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer
 
 	for (i=0; i <numSamples; i++)
 		buf2[i] = (float)(buf[1][i]*limiter_gain[i]);
+#endif
 
     // In case we have more outputs than inputs, we'll clear any output
     // channels that didn't contain input data, (because these aren't