diff --git a/lib_com/options.h b/lib_com/options.h
index fbad02037115a15321d67995e4e298bfc1e119b2..4e0286303664f1d797a0c83df8887a63f222c7f1 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,6 +164,7 @@
 #define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/
 #define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
 #define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
+#define FIX_570_SF_EXT_ORIENTATION
 #define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
 #define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */
 #define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c
index 2cd2744b5ab8e04baa373b461073442f2d21e6b5..205fc271d06fd38a61bb12f776c5f694d4f460a7 100644
--- a/lib_rend/ivas_rotation.c
+++ b/lib_rend/ivas_rotation.c
@@ -789,8 +789,10 @@ ivas_error ivas_combined_orientation_open(
     {
         ( *hCombinedOrientationData )->enableCombinedOrientation[i] = 0;
         ( *hCombinedOrientationData )->Quaternions[i] = identity;
+#ifndef FIX_570_SF_EXT_ORIENTATION
         ( *hCombinedOrientationData )->Quaternions_prev_headRot[i] = identity;
         ( *hCombinedOrientationData )->Quaternions_prev_extOrientation[i] = identity;
+#endif
         ( *hCombinedOrientationData )->listenerPos[i] = origo;
 
         for ( j = 0; j < 3; j++ )
@@ -799,6 +801,11 @@ ivas_error ivas_combined_orientation_open(
             ( *hCombinedOrientationData )->Rmat[i][j][j] = 1.0f;
         }
     }
+#ifdef FIX_570_SF_EXT_ORIENTATION
+    ( *hCombinedOrientationData )->Quaternion_prev_extOrientation = identity;
+    ( *hCombinedOrientationData )->Quaternion_frozen_ext = identity;
+    ( *hCombinedOrientationData )->Quaternion_frozen_head = identity;
+#endif
 
     for ( j = 0; j < 3; j++ )
     {
@@ -811,6 +818,11 @@ ivas_error ivas_combined_orientation_open(
     set_zero( ( *hCombinedOrientationData )->procChEneIIR[0], MASA_FREQUENCY_BANDS );
     set_zero( ( *hCombinedOrientationData )->procChEneIIR[1], MASA_FREQUENCY_BANDS );
 
+#ifdef FIX_570_SF_EXT_ORIENTATION
+    ( *hCombinedOrientationData )->isExtOrientationFrozen = 0;
+    ( *hCombinedOrientationData )->isHeadRotationFrozen = 0;
+#endif
+
     return IVAS_ERR_OK;
 }
 
@@ -981,6 +993,23 @@ static ivas_error combine_external_and_head_orientations(
         /* External orientations */
         for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
         {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+            /* Check for frozen external orientation */
+            if ( hExtOrientationData->enableExternalOrientation[i] == 2 )
+            {
+                if ( hCombinedOrientationData->isExtOrientationFrozen != 1 )
+                {
+                    hCombinedOrientationData->Quaternion_frozen_ext = hExtOrientationData->Quaternions[i];
+                    hCombinedOrientationData->isExtOrientationFrozen = 1;
+                }
+            }
+            else
+            {
+                hCombinedOrientationData->Quaternion_frozen_ext = identity;
+                hCombinedOrientationData->isExtOrientationFrozen = 0;
+            }
+#endif
+
             if ( hExtOrientationData->enableRotationInterpolation[i] == 1 && hExtOrientationData->enableExternalOrientation[i] > 0 )
             {
                 if ( hCombinedOrientationData->isInterpolationOngoing == TRUE && hCombinedOrientationData->interpolationCoefficient <= 1.0f && are_orientations_same( &hCombinedOrientationData->Quaternions_ext_interpolation_target, &hExtOrientationData->Quaternions[i] ) == true )
@@ -1010,7 +1039,11 @@ static ivas_error combine_external_and_head_orientations(
                 /* Use the freezed external orientation */
                 else if ( hExtOrientationData->enableExternalOrientation[i] == 2 )
                 {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+                    hCombinedOrientationData->Quaternions[i] = hCombinedOrientationData->Quaternion_frozen_ext;
+#else
                     hCombinedOrientationData->Quaternions[i] = hCombinedOrientationData->Quaternions_prev_extOrientation[i];
+#endif
                 }
             }
         }
@@ -1021,6 +1054,22 @@ static ivas_error combine_external_and_head_orientations(
         /* Combine head and external orientations */
         for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
         {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+            /* Check for frozen head rotation */
+            if ( hExtOrientationData->enableHeadRotation[i] == 2 && numHeadRotQuaternions >= 0 )
+            {
+                if ( hCombinedOrientationData->isHeadRotationFrozen != 1 )
+                {
+                    hCombinedOrientationData->Quaternion_frozen_head = headRotQuaternions[i];
+                    hCombinedOrientationData->isHeadRotationFrozen = 1;
+                }
+            }
+            else
+            {
+                hCombinedOrientationData->Quaternion_frozen_head = identity;
+                hCombinedOrientationData->isHeadRotationFrozen = 0;
+            }
+#endif
             /* Use the most recent head rotation */
             if ( hExtOrientationData->enableHeadRotation[i] == 1 && numHeadRotQuaternions >= 0 )
             {
@@ -1038,11 +1087,19 @@ static ivas_error combine_external_and_head_orientations(
             {
                 if ( hExtOrientationData->enableExternalOrientation[i] > 0 )
                 {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+                    QuaternionProduct( hCombinedOrientationData->Quaternions[i], hCombinedOrientationData->Quaternion_frozen_head, &hCombinedOrientationData->Quaternions[i] );
+#else
                     QuaternionProduct( hCombinedOrientationData->Quaternions[i], hCombinedOrientationData->Quaternions_prev_headRot[i], &hCombinedOrientationData->Quaternions[i] );
+#endif
                 }
                 else
                 {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+                    hCombinedOrientationData->Quaternions[i] = hCombinedOrientationData->Quaternion_frozen_head;
+#else
                     hCombinedOrientationData->Quaternions[i] = hCombinedOrientationData->Quaternions_prev_headRot[i];
+#endif
                 }
             }
 
@@ -1066,6 +1123,16 @@ static ivas_error combine_external_and_head_orientations(
     /* Save the current orientations */
     if ( hExtOrientationData != NULL )
     {
+#ifdef FIX_570_SF_EXT_ORIENTATION
+        if ( hExtOrientationData->enableExternalOrientation[MAX_PARAM_SPATIAL_SUBFRAMES - 1] > 0 )
+        {
+            hCombinedOrientationData->Quaternion_prev_extOrientation = hExtOrientationData->Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES - 1];
+        }
+        else
+        {
+            hCombinedOrientationData->Quaternion_prev_extOrientation = identity;
+        }
+#else
         for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
         {
             if ( hExtOrientationData->enableExternalOrientation[i] > 0 )
@@ -1077,11 +1144,13 @@ static ivas_error combine_external_and_head_orientations(
                 hCombinedOrientationData->Quaternions_prev_extOrientation[i] = identity;
             }
         }
+#endif
     }
     if ( headRotQuaternions != NULL )
     {
         for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
         {
+#ifndef FIX_570_SF_EXT_ORIENTATION
             if ( hExtOrientationData != NULL )
             {
                 if ( hExtOrientationData->enableHeadRotation[i] > 0 && numHeadRotQuaternions >= 0 )
@@ -1104,6 +1173,7 @@ static ivas_error combine_external_and_head_orientations(
                     hCombinedOrientationData->Quaternions_prev_headRot[i] = identity;
                 }
             }
+#endif
             hCombinedOrientationData->listenerPos[i] = listenerPos[i];
         }
     }
@@ -1189,7 +1259,25 @@ static void external_target_interpolation(
             hCombinedOrientationData->Quaternions_ext_interpolation_target = hExtOrientationData->Quaternions[i];
 
             /* Use the most recent external orientation as the starting orientation */
+#ifdef FIX_570_SF_EXT_ORIENTATION
+            if ( hExtOrientationData->enableExternalOrientation[i] == 1 )
+            {
+                if ( i > 0 )
+                {
+                    hCombinedOrientationData->Quaternions_ext_interpolation_start = hExtOrientationData->Quaternions[i - 1];
+                }
+                else
+                {
+                    hCombinedOrientationData->Quaternions_ext_interpolation_start = hCombinedOrientationData->Quaternion_prev_extOrientation;
+                }
+            }
+            else if ( hExtOrientationData->enableExternalOrientation[i] == 2 )
+            {
+                hCombinedOrientationData->Quaternions_ext_interpolation_start = hCombinedOrientationData->Quaternion_frozen_ext;
+            }
+#else
             hCombinedOrientationData->Quaternions_ext_interpolation_start = hCombinedOrientationData->Quaternions_prev_extOrientation[i];
+#endif
 
             /* Calculate the interpolation increment and coefficient */
             hCombinedOrientationData->interpolationIncrement = 1.0f / ( (float) hExtOrientationData->numFramesToTargetOrientation[i] * (float) MAX_PARAM_SPATIAL_SUBFRAMES );
diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h
index c763630325297df7dc08b38100fa4b99d5c32c79..8ed74b1e2c8be1e9b606756cd0f0ff3362333a5e 100644
--- a/lib_rend/ivas_stat_rend.h
+++ b/lib_rend/ivas_stat_rend.h
@@ -304,8 +304,12 @@ typedef struct ivas_combined_orientation_struct
     float lrSwitchInterpVal;
     bool isInterpolationOngoing;
     IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES];
+#ifdef FIX_570_SF_EXT_ORIENTATION
+    IVAS_QUATERNION Quaternion_prev_extOrientation;
+#else
     IVAS_QUATERNION Quaternions_prev_headRot[MAX_PARAM_SPATIAL_SUBFRAMES];
     IVAS_QUATERNION Quaternions_prev_extOrientation[MAX_PARAM_SPATIAL_SUBFRAMES];
+#endif
     IVAS_QUATERNION Quaternions_ext_interpolation_start;
     IVAS_QUATERNION Quaternions_ext_interpolation_target;
     float Rmat[MAX_PARAM_SPATIAL_SUBFRAMES][3][3];
@@ -314,6 +318,10 @@ typedef struct ivas_combined_orientation_struct
     float procChEneIIR[2][MASA_FREQUENCY_BANDS];
     int16_t shd_rot_max_order;
     IVAS_VECTOR3 listenerPos[MAX_PARAM_SPATIAL_SUBFRAMES];
+    IVAS_QUATERNION Quaternion_frozen_ext;
+    IVAS_QUATERNION Quaternion_frozen_head;
+    int8_t isExtOrientationFrozen;
+    int8_t isHeadRotationFrozen;
 
 } COMBINED_ORIENTATION_DATA, *COMBINED_ORIENTATION_HANDLE;