diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index 0c45720b1..40e50cc25 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -113,4 +113,13 @@ else {
    }
 }
 
+## discipline = 10, parameterCategory = 0 are WMO wave parameters !
+#if (discipline == 10 && parameterCategory == 0) {
+## paramIds 140xxx are for wave parameters, exception for wave spectra templates
+if (paramId >= 140000 && paramId < 141000 && productDefinitionTemplateNumber != 99 && productDefinitionTemplateNumber != 100 && productDefinitionTemplateNumber != 101 && productDefinitionTemplateNumber != 102){
+  transient paramType="wave";
+  unalias mars.paramtype ;
+  alias mars.paramtype = paramType ;
+}
+
 meta md5Section4 md5(offsetSection4,section4Length);
diff --git a/definitions/grib2/template.4.parameter.def b/definitions/grib2/template.4.parameter.def
index 95ef3b5bb..2b6da0061 100644
--- a/definitions/grib2/template.4.parameter.def
+++ b/definitions/grib2/template.4.parameter.def
@@ -10,10 +10,3 @@ codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) :
 codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump;
 meta parameterUnits codetable_units(parameterNumber) : dump;
 meta parameterName  codetable_title(parameterNumber) : dump;
-
-# discipline = 10, parameterCategory = 0 are WMO wave parameters !
-if (discipline == 10 && parameterCategory == 0) {
-  transient paramType="wave";
-  unalias mars.paramtype ;
-  alias mars.paramtype = paramType ;
-}