diff --git a/apps/decoder.c b/apps/decoder.c
index 1493350f7b0d3f9758d6e9b5b0df019e2e3d0168..6cad55371a8a430c0c526ed960044685f007aeca 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1576,7 +1576,12 @@ static bool parseCmdlIVAS_dec(
         return false;
     }
 
+#ifdef FIX_807_VARIABLE_SPEED_DECODING
+    if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) && ( !arg->tsmEnabled ) )
+#else
     if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) )
+#endif
+
     {
         arg->enable5ms = false;
     }
diff --git a/lib_com/options.h b/lib_com/options.h
index b0ab3881aa047b4b035a74ef6e2cb2dd806cb202..095cc709b0e0bec146db6479e0551f5600c805c3 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -182,6 +182,7 @@
 #define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK               /* fix 755 */
 #define FIX_803_SCE_MD_HANDLE                           /* VA: issue 803: Resolve "MD handle needed only for one SCE" */
 #define FIX_812_DOUBLE_PREC_MCT                         /* FhG: Issue 812: Avoid double precision in MCT */
+#define FIX_807_VARIABLE_SPEED_DECODING                 /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */
 
 /* #################### End BE switches ################################## */