diff --git a/src/cdilib.c b/src/cdilib.c
index e8ae9491f3cf8c7c61fd5fc7282294a373ff9337..404f8a74783615328f3f84461d9cc8e7b71e9ee6 100644
--- a/src/cdilib.c
+++ b/src/cdilib.c
@@ -53473,7 +53473,7 @@ gribapiEncode(int memType, int varID, int levelID, int vlistID, int gridID, int
           str_to_lower(cdi_name);
           str_to_lower(grb_name);
           bool checkName = (!grb_name[0] && strncmp(cdi_name, "param", 5) == 0) ? false : true;
-          if (checkName && ((strlen(cdi_name) != strlen(grb_name)) || !strStartsWith(cdi_name, grb_name)))
+          if (CDI_Debug && checkName && ((strlen(cdi_name) != strlen(grb_name)) || !strStartsWith(cdi_name, grb_name)))
             Warning("*** GRIB2 shortName does not correspond to chosen variable name: \"%s\" (\"%s\").",
                     grb_name[0] ? grb_name : "unknown", cdi_name);
         }
diff --git a/src/stream_gribapi.c b/src/stream_gribapi.c
index d236779b4394ac977b14f86bb632952494efa8da..2d3db5982e9f3592f318586345d8e503070130f4 100644
--- a/src/stream_gribapi.c
+++ b/src/stream_gribapi.c
@@ -3381,7 +3381,7 @@ gribapiEncode(int memType, int varID, int levelID, int vlistID, int gridID, int
           str_to_lower(cdi_name);
           str_to_lower(grb_name);
           bool checkName = (!grb_name[0] && strncmp(cdi_name, "param", 5) == 0) ? false : true;
-          if (checkName && ((strlen(cdi_name) != strlen(grb_name)) || !strStartsWith(cdi_name, grb_name)))
+          if (CDI_Debug && checkName && ((strlen(cdi_name) != strlen(grb_name)) || !strStartsWith(cdi_name, grb_name)))
             Warning("*** GRIB2 shortName does not correspond to chosen variable name: \"%s\" (\"%s\").",
                     grb_name[0] ? grb_name : "unknown", cdi_name);
         }