diff --git a/apps/decoder.c b/apps/decoder.c
index bd95ddd597671f2de8a1e636d77f5b8ff04f8eba..04a93a0e59227d3ca258c1a4d822cb3582da64ee 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -1508,7 +1508,27 @@ static bool parseCmdlIVAS_dec(
      * Mandatory input arguments
      *-----------------------------------------------------------------*/
 
+#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
+    if ( i < argc - 4 )
+    {
+        for ( i = 1; i < argc; i++ )
+        {
+            if ( argv[i][0] == '-' )
+            {
+                fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );
+                usage_dec();
+                return false;
+            }
+        }
+
+        fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );
+        usage_dec();
+        return false;
+    }
+    else if ( i < argc - 3 )
+#else
     if ( i < argc - 3 )
+#endif
     {
         arg->outputConfig = cmdline2config( argv[i] );
         if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
diff --git a/lib_com/options.h b/lib_com/options.h
index d118b9406dcf01fad46d57801fb8bf1a8b775be2..fda39ad06bc9a834fcef3a4d421bc27e16b7f93a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -187,6 +187,7 @@
 #define NONBE_FIX_952_MC_PARAMUPMIX_5MS                       /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
 #define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */
 #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
+#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */
 
 /* #################### End BASOP porting switches ############################ */