diff --git a/lib_com/options.h b/lib_com/options.h
index 8e397881cf4da5a2da520ca45e2b3c7860d32351..92c716fc81b5750bcbb66b059a8957c6262690d2 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -166,6 +166,7 @@
 
 #define FIX_343_TO_UPPER                                /* VA: issue 343: safeguard for function to_upper() */
 
+#define FIX_107_5MS_SUBFRAME_RENDERING                  /* Issue 107: use 5ms subframes everywhere in parametric binauralizer */
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_dec/ivas_dirac_dec_binaural_functions.c b/lib_dec/ivas_dirac_dec_binaural_functions.c
index 4d6f8e4d288c3d25e12cf0af9819260229aaa58e..8a9b38a9d5cbf7cc958d496690c55f8ea43eba99 100644
--- a/lib_dec/ivas_dirac_dec_binaural_functions.c
+++ b/lib_dec/ivas_dirac_dec_binaural_functions.c
@@ -138,6 +138,9 @@ ivas_error ivas_dirac_dec_init_binaural_data(
     set_zero( hBinaural->ChCrossImOutPrev, nBins );
     hBinaural->renderStereoOutputInsteadOfBinaural = 0;
 
+#ifdef FIX_107_5MS_SUBFRAME_RENDERING
+    hBinaural->useSubframeMode = 1;
+#else
     if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) /* Use subframe-mode with SPAR, since the metadata is not in sync on a frame level */
     {
         hBinaural->useSubframeMode = 1;
@@ -150,6 +153,7 @@ ivas_error ivas_dirac_dec_init_binaural_data(
         hBinaural->useSubframeMode = 0; /* Default to 20 ms mode. */
 #endif
     }
+#endif
 
     hBinaural->useTdDecorr = 0;
     if ( st_ivas->ivas_format == SBA_FORMAT )
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 300130bcfe72f8f9e3702722a6d7587d3ce6e567..c721fe307d44a40524c17914789d149b01ab0f29 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -2207,7 +2207,9 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud
         {
             return error;
         }
+#ifndef FIX_107_5MS_SUBFRAME_RENDERING
         decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */
+#endif
     }
 
     numCldfbAnalyses = decDummy->nchan_transport;
@@ -2362,7 +2364,9 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE
         return error;
     }
 
+#ifndef FIX_107_5MS_SUBFRAME_RENDERING
     decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */
+#endif
 
     for ( i = 0; i < BINAURAL_CHANNELS; i++ )
     {