diff --git a/lib_com/options.h b/lib_com/options.h
index f864c9fee1803e7b4f517bdeba181e1215cbb5cf..f5a82aa3fda524316083bd7f443cbf66bcbe63de 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -241,6 +241,7 @@
 #define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */
 #define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */
 #define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */
+#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */
 
 /* ################## End BE DEVELOPMENT switches ######################### */
 
diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c
index e79c0a01a71023610dc7ea0d615ce3af7457a696..d97f9f59c685708e9499d14718b76e8646675000 100644
--- a/lib_enc/ivas_qspherical_enc.c
+++ b/lib_enc/ivas_qspherical_enc.c
@@ -64,7 +64,11 @@ void quantize_direction_frame(
 )
 {
     int16_t i, j;
+#ifdef FIX_689_USAN_QSPHERICAL
+    uint16_t idx;
+#else
     int16_t idx;
+#endif
 
     /* Quantize directions */
     q_direction->not_in_2D = 0;
@@ -169,8 +173,11 @@ void quantize_direction_frame2D(
     float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] )
 {
     int16_t i, j;
+#ifdef FIX_689_USAN_QSPHERICAL
+    uint16_t idx;
+#else
     int16_t idx;
-
+#endif
     /* Quantize directions */
     q_direction->not_in_2D = 0;
     for ( i = q_direction->cfg.start_band; i < q_direction->cfg.nbands; i++ )