diff --git a/Source/ProgramManager.cpp b/Source/ProgramManager.cpp
index 92002110..cbd0079e 100644
--- a/Source/ProgramManager.cpp
+++ b/Source/ProgramManager.cpp
@@ -261,20 +261,12 @@ void setButtonValue(uint8_t ch, uint8_t value){
   button_values |= (bool(value)<<ch);
 }
 
-#if 0 // pre / post fx
-#ifdef USE_USBD_AUDIO_TX
-#define USE_USBD_AUDIO_TX_PRE_FX
-#endif
-#ifdef USE_USBD_AUDIO_RX
+// pre / post fx routing
+#if defined USE_USBD_AUDIO_RX and !defined USE_USBD_AUDIO_RX_POST_FX
 #define USE_USBD_AUDIO_RX_PRE_FX
 #endif
-#else
-#ifdef USE_USBD_AUDIO_TX
-#define USE_USBD_AUDIO_TX_POST_FX
-#endif
-#ifdef USE_USBD_AUDIO_RX
-#define USE_USBD_AUDIO_RX_POST_FX
-#endif
+#if defined USE_USBD_AUDIO_TX and !defined USE_USBD_AUDIO_TX_POST_FX
+#define USE_USBD_AUDIO_TX_PRE_FX
 #endif
 
 /* called by the program when a block has been processed */
diff --git a/XibecaDevKit/Core/Inc/hardware.h b/XibecaDevKit/Core/Inc/hardware.h
index 982d8416..8ef3d760 100644
--- a/XibecaDevKit/Core/Inc/hardware.h
+++ b/XibecaDevKit/Core/Inc/hardware.h
@@ -39,6 +39,9 @@
 #define CODEC_BLOCKSIZE              256 // with bs=512 DMA_D2=64k overflows by 1580 bytes
 #define AUDIO_BLOCK_SIZE             32
 
+#define USE_USBD_AUDIO_RX_POST_FX
+#define USE_USBD_AUDIO_TX_POST_FX
+
 /* USB audio settings */
 #define AUDIO_BITS_PER_SAMPLE       16
 #define AUDIO_BYTES_PER_SAMPLE      (AUDIO_BITS_PER_SAMPLE/8)