diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
index 83380c98b5..ebc551ded2 100644
--- a/workflow/hosts/awspw.yaml
+++ b/workflow/hosts/awspw.yaml
@@ -27,5 +27,4 @@ MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
 DO_METP: 'NO'
-SUPPORT_WAVES: 'YES'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml
index 61aa777ff3..d7c064dc60 100644
--- a/workflow/hosts/azurepw.yaml
+++ b/workflow/hosts/azurepw.yaml
@@ -27,5 +27,4 @@ MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
 DO_METP: 'NO'
-SUPPORT_WAVES: 'YES'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/hosts/googlepw.yaml b/workflow/hosts/googlepw.yaml
index ec71fd4f3a..8ba8e18e74 100644
--- a/workflow/hosts/googlepw.yaml
+++ b/workflow/hosts/googlepw.yaml
@@ -27,5 +27,4 @@ MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
 DO_METP: 'NO'
-SUPPORT_WAVES: 'YES'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C384'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
index 27da4943d3..c9b22ee8b3 100755
--- a/workflow/setup_expt.py
+++ b/workflow/setup_expt.py
@@ -371,7 +371,6 @@ def query_and_clean(dirname, force_clean=False):
 
 def validate_user_request(host, inputs):
     supp_res = host.info['SUPPORTED_RESOLUTIONS']
-    supp_waves = host.info.get('SUPPORT_WAVES', 'YES')
     machine = host.machine
     for attr in ['resdetatmos', 'resensatmos']:
         try:
@@ -381,9 +380,6 @@ def validate_user_request(host, inputs):
         if expt_res not in supp_res:
             raise NotImplementedError(f"Supported resolutions on {machine} are:\n{', '.join(supp_res)}")
 
-    if "W" in inputs.app and supp_waves == "NO":
-        raise NotImplementedError(f"Waves are not supported on {machine}")
-
 
 def get_ocean_resolution(resdetatmos):
     """