diff --git a/apps/decoder.c b/apps/decoder.c
index ce81d3a904c0c960e73bead302a3aa4672a2a93c..6788953ee80e3ecc43a9c70befc56600a04170fc 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1585,6 +1585,24 @@ static ivas_error decodeG192(
         }
 
 #ifdef FIX_I109_ORIENTATION_TRACKING
+#ifdef OTR_REFERENCE_VECTOR_TRACKING
+        /* reference vector */
+        if ( arg.enableReferenceVectorTracking )
+        {
+            IVAS_VECTOR3 listenerPosition, referencePosition;
+            if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPosition, &referencePosition ) ) != IVAS_ERR_OK )
+            {
+                fprintf( stderr, "\nError %s while reading listener and reference positions from %s\n", IVAS_DEC_GetErrorMessage( error ), Vector3PairFileReader_getFilePath( referenceVectorReader ) );
+                goto cleanup;
+            }
+
+            if ( ( error = IVAS_DEC_FeedRefVectorData( hIvasDec, listenerPosition, referencePosition ) ) != IVAS_ERR_OK )
+            {
+                fprintf( stderr, "\nIVAS_DEC_FeedRefVectorData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+                goto cleanup;
+            }
+        }
+#endif /* OTR_REFERENCE_VECTOR_TRACKING */
         /* Reference rotation */
         if ( arg.enableReferenceRotation )
         {
@@ -1630,44 +1648,6 @@ static ivas_error decodeG192(
                 goto cleanup;
             }
         }
-
-#ifdef FIX_I109_ORIENTATION_TRACKING
-        /* Reference rotation */
-        if ( arg.enableReferenceRotation )
-        {
-            IVAS_QUATERNION quaternion;
-            if ( ( error = HeadRotationFileReading( refRotReader, &quaternion ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) );
-                goto cleanup;
-            }
-
-            if ( ( error = IVAS_DEC_FeedRefRotData( hIvasDec, quaternion ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "\nIVAS_DEC_FeedRefRotData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
-                goto cleanup;
-            }
-        }
-#ifdef OTR_REFERENCE_VECTOR_TRACKING
-        /* reference vector */
-        if ( arg.enableReferenceVectorTracking )
-        {
-            IVAS_VECTOR3 listenerPosition, referencePosition;
-            if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPosition, &referencePosition ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "\nError %s while reading listener and reference positions from %s\n", IVAS_DEC_GetErrorMessage( error ), Vector3PairFileReader_getFilePath( referenceVectorReader ) );
-                goto cleanup;
-            }
-
-            if ( ( error = IVAS_DEC_FeedRefVectorData( hIvasDec, listenerPosition, referencePosition ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "\nIVAS_DEC_FeedRefVectorData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
-                goto cleanup;
-            }
-        }
-#endif /* OTR_REFERENCE_VECTOR_TRACKING */
-#endif
-
         /* Run decoder for one frame (get rendered output) */
         if ( ( error = IVAS_DEC_GetSamples( hIvasDec, pcmBuf, &nOutSamples ) ) != IVAS_ERR_OK )
         {
diff --git a/apps/renderer.c b/apps/renderer.c
index 7206d1458587005c9ff4d7a48812be8b5b5fcdeb..9437204ee668ebfeda6aa6130569c16db50100b6 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -980,6 +980,22 @@ int main(
         IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer );
 
 #ifdef FIX_I109_ORIENTATION_TRACKING
+#ifdef OTR_REFERENCE_VECTOR_TRACKING
+        if ( referenceVectorReader != NULL )
+        {
+            IVAS_VECTOR3 listenerPos, refPos;
+            if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPos, &refPos ) ) != IVAS_ERR_OK )
+            {
+                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
+                exit( -1 );
+            }
+            if ( ( error = IVAS_REND_SetReferenceVector( hIvasRend, listenerPos, refPos ) ) != IVAS_ERR_OK )
+            {
+                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
+                exit( -1 );
+            }
+        }
+#endif /* OTR_REFERENCE_VECTOR_TRACKING */
         /* Read from reference rotation trajectory file if specified */
         if ( referenceRotReader != NULL )
         {
@@ -1028,40 +1044,6 @@ int main(
             }
         }
 
-#ifdef FIX_I109_ORIENTATION_TRACKING
-#ifdef OTR_REFERENCE_VECTOR_TRACKING
-        if ( referenceVectorReader != NULL )
-        {
-            IVAS_VECTOR3 listenerPos, refPos;
-            if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPos, &refPos ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
-                exit( -1 );
-            }
-            if ( ( error = IVAS_REND_SetReferenceVector( hIvasRend, listenerPos, refPos ) ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
-                exit( -1 );
-            }
-        }
-#endif /* OTR_REFERENCE_VECTOR_TRACKING */
-        /* Read from reference rotation trajectory file if specified */
-        if ( referenceRotReader != NULL )
-        {
-            IVAS_QUATERNION quaternion;
-            if ( HeadRotationFileReading( referenceRotReader, &quaternion ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "Error in Head Rotation File Reading.\r\n" );
-                exit( -1 );
-            }
-            if ( IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) != IVAS_ERR_OK )
-            {
-                fprintf( stderr, "Error setting Reference Rotation.\r\n" );
-                exit( -1 );
-            }
-        }
-#endif
-
         for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
         {
             if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, mcIds[i], &numChannels ) ) != IVAS_ERR_OK )