diff --git a/lib_com/options.h b/lib_com/options.h
index b556709497b466555e18aa2946b71a595c918a24..6040e4ed854a039a95e3faad8e84ea74a1aab776 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -158,6 +158,8 @@
 #define OSBA_SPLIT_RENDERING
 #endif
 
+#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */
+
 
 /* ################## End BE DEVELOPMENT switches ######################### */
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 1f401bb42084a678bf330a5141f702a12e35c0ba..779c3d390e4bc372db9ddbab9ee77e5ca4ba01e2 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2438,7 +2438,11 @@ void ivas_initialize_handles_dec(
     st_ivas->hJbmMetadata = NULL;
 
     /*  floating-point output audio buffers */
+#ifdef FIX_719_CRASH_IN_CLEANUP
+    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
+#else
     for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+#endif
     {
         st_ivas->p_output_f[i] = NULL;
     }