diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c
index 5197a260b9ab0ad830176956a6c33a550cb8e522..5648aa794d5b1212b241548568a9cd94ad8de2ea 100644
--- a/lib_enc/ivas_sns_enc.c
+++ b/lib_enc/ivas_sns_enc.c
@@ -410,7 +410,6 @@ int16_t quantize_sns(
     idxIndices = 0;
     set_f( weights, 1.0f, M );
 
-    /* stereo mode decision */
     sns_stereo_mode[0] = SNS_STEREO_MODE_LR;
     sns_stereo_mode[1] = SNS_STEREO_MODE_LR;
     zero_side_flag[0] = 0;
@@ -426,6 +425,7 @@ int16_t quantize_sns(
         }
     }
 
+    /* stereo mode decision */
     if ( sts[0]->core == sts[1]->core )
     {
         nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;
@@ -448,20 +448,7 @@ int16_t quantize_sns(
         }
     }
 
-    /* prepare buffers depending on the chosen stereo mode */
-
-
-    nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;
-    for ( k = 0; k < nSubframes; ++k )
-    {
-        mvr2r( sns_in[0][k], snsQ_out[0][k], M );
-        mvr2r( sns_in[1][k], snsQ_out[1][k], M );
-        if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS )
-        {
-            convertToMS( M, snsQ_out[0][k], snsQ_out[1][k], 0.5f );
-        }
-    }
-
+    /* run MSVQ */
     for ( ch = 0; ch < CPE_CHANNELS; ++ch )
     {
         st = sts[ch];
@@ -507,6 +494,7 @@ int16_t quantize_sns(
         }
     }
 
+    /* get back to L/F representation */
     if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS )
     {
         nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV;
@@ -519,6 +507,5 @@ int16_t quantize_sns(
         }
     }
 
-
     return nbits;
 }