diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
index df723fdd0b..d495d29235 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
+++ b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c
@@ -1015,7 +1015,7 @@ const int16_t WebRtcIsacfix_kCodeLenGainQ11[392] = {
   , 30720, 30720
 };
 
-const int16_t WebRtcIsacfix_kCodeLenShapeQ11[577] = {
+const int16_t WebRtcIsacfix_kCodeLenShapeQ11[578] = {
   0,     0,     0,     0,     0,     0,     0,     0,     0, 28672
   ,     0, 26624,     1, 23773, 22819,     4, 20982, 18598,    10, 19282
   , 16587,    22, 16442, 26624, 13126,    60, 14245, 26624, 26624, 12736
@@ -1073,7 +1073,8 @@ const int16_t WebRtcIsacfix_kCodeLenShapeQ11[577] = {
   , 16983, 16431, 16162, 15021, 15178, 13751, 12142, 10895, 10193,  9632
   ,  9086,  8896,  8823,  8735,  8591,  8754,  8649,  8361,  8329,  8522
   ,  8373,  8739,  8993,  9657, 10454, 11279, 11899, 12614, 14024, 14273
-  , 15477, 15240, 16649, 17866, 18697, 21151, 22099
+  , 15477, 15240, 16649, 17866, 18697, 21151, 22099, 0
+  // The final 0 was added due to http://bugs.webrtc.org/10584.
 };
 
 /* left KLT transforms */
diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
index 2d68fa6c6e..6965822952 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
+++ b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
@@ -77,7 +77,7 @@ extern const uint16_t* WebRtcIsacfix_kCdfShapePtr[KLT_NUM_MODELS][108];
 /* code length for all coefficients using different models */
 extern const int16_t WebRtcIsacfix_kCodeLenGainQ11[392];
 
-extern const int16_t WebRtcIsacfix_kCodeLenShapeQ11[577];
+extern const int16_t WebRtcIsacfix_kCodeLenShapeQ11[578];
 
 /* left KLT transforms */
 extern const int16_t WebRtcIsacfix_kT1GainQ15[KLT_NUM_MODELS][4];