diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
index eb7ded32..7bf378db 100644
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -718,7 +718,6 @@ void decouple(chanend c_mix_out
             /* Check for freq change or other update */
 
             GET_SHARED_GLOBAL(tmp, g_freqChange_flag);
-#if (MIN_FREQ != MAX_FREQ)
             if (tmp == SET_SAMPLE_FREQ)
             {
                 SET_SHARED_GLOBAL(g_freqChange_flag, 0);
@@ -765,7 +764,6 @@ void decouple(chanend c_mix_out
                 speedRem = 0;
                 continue;
             }
-#endif
 #if (AUDIO_CLASS == 2)
 #if (MIN_FREQ != MAX_FREQ)
             else
diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
index 19e20585..3e0bc540 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -312,11 +312,11 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
                 {
                     unsigned cmd = inuint(c_aud_ctl);
 
-#if (MAX_FREQ != MIN_FREQ)
                     if(cmd == SET_SAMPLE_FREQ)
                     {
                         unsigned receivedSampleFreq = inuint(c_aud_ctl);
 
+#if (MAX_FREQ != MIN_FREQ)
                         /* Don't update things for DFU command.. */
                         if(receivedSampleFreq != AUDIO_STOP_FOR_DFU)
                         {
@@ -347,13 +347,13 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
                                 masterClockFreq = MCLK_441;
                             }
                         }
+#endif
                         /* Ideally we want to wait for handshake (and pass back up) here.  But we cannot keep this
                         * core locked, it must stay responsive to packets (MIDI etc) and SOFs.  So, set a flag and check for
                         * handshake elsewhere */
                         SET_SHARED_GLOBAL(g_freqChange_sampFreq, receivedSampleFreq);
                     }
                     else 
-#endif
 #if (AUDIO_CLASS == 2)
                         if(cmd == SET_STREAM_FORMAT_IN)
                     {