diff --git a/charts/consul/templates/_helpers.tpl b/charts/consul/templates/_helpers.tpl
index 285715225b..aa62cb6600 100644
--- a/charts/consul/templates/_helpers.tpl
+++ b/charts/consul/templates/_helpers.tpl
@@ -506,9 +506,6 @@ Usage: {{ template "consul.validateResourceAPIs" . }}
 {{- if (and (mustHas "resource-apis" .Values.global.experiments) .Values.syncCatalog.enabled ) }}
 {{fail "When the value global.experiments.resourceAPIs is set, syncCatalog.enabled is currently unsupported."}}
 {{- end }}
-{{- if (and (mustHas "resource-apis" .Values.global.experiments) .Values.meshGateway.enabled ) }}
-{{fail "When the value global.experiments.resourceAPIs is set, meshGateway.enabled is currently unsupported."}}
-{{- end }}
 {{- if (and (mustHas "resource-apis" .Values.global.experiments) .Values.ingressGateways.enabled ) }}
 {{fail "When the value global.experiments.resourceAPIs is set, ingressGateways.enabled is currently unsupported."}}
 {{- end }}
diff --git a/charts/consul/templates/gateway-resources-configmap.yaml b/charts/consul/templates/gateway-resources-configmap.yaml
index 740c0655f6..3e8c7b53c6 100644
--- a/charts/consul/templates/gateway-resources-configmap.yaml
+++ b/charts/consul/templates/gateway-resources-configmap.yaml
@@ -16,7 +16,7 @@ data:
   resources.json: |
     {{ toJson .Values.connectInject.apiGateway.managedGatewayClass.resources }}
   {{- end }}
-  {{- if (mustHas "resource-apis" .Values.global.experiments) }}
+  {{- if and (mustHas "resource-apis" .Values.global.experiments) .Values.meshGateway.enabled }}
   config.yaml: |
     gatewayClassConfigs:
       - apiVersion: mesh.consul.hashicorp.com/v2beta1
diff --git a/charts/consul/templates/mesh-gateway-clusterrole.yaml b/charts/consul/templates/mesh-gateway-clusterrole.yaml
index b951418b26..3053105105 100644
--- a/charts/consul/templates/mesh-gateway-clusterrole.yaml
+++ b/charts/consul/templates/mesh-gateway-clusterrole.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -32,3 +33,4 @@ rules:
 rules: []
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/consul/templates/mesh-gateway-clusterrolebinding.yaml b/charts/consul/templates/mesh-gateway-clusterrolebinding.yaml
index f8150ebb53..2fb80fc04c 100644
--- a/charts/consul/templates/mesh-gateway-clusterrolebinding.yaml
+++ b/charts/consul/templates/mesh-gateway-clusterrolebinding.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -18,3 +19,4 @@ subjects:
     name: {{ template "consul.fullname" . }}-mesh-gateway
     namespace: {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/charts/consul/templates/mesh-gateway-deployment.yaml b/charts/consul/templates/mesh-gateway-deployment.yaml
index afb5d44a0e..cda371d58a 100644
--- a/charts/consul/templates/mesh-gateway-deployment.yaml
+++ b/charts/consul/templates/mesh-gateway-deployment.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 {{- if not .Values.connectInject.enabled }}{{ fail "connectInject.enabled must be true" }}{{ end -}}
 {{- if and .Values.global.acls.manageSystemACLs (ne .Values.meshGateway.consulServiceName "") (ne .Values.meshGateway.consulServiceName "mesh-gateway") }}{{ fail "if global.acls.manageSystemACLs is true, meshGateway.consulServiceName cannot be set" }}{{ end -}}
 {{- if .Values.meshGateway.globalMode }}{{ fail "meshGateway.globalMode is no longer supported; instead, you must migrate to CRDs (see www.consul.io/docs/k8s/crds/upgrade-to-crds)" }}{{ end -}}
@@ -309,3 +310,4 @@ spec:
         {{ tpl .Values.meshGateway.nodeSelector . | indent 8 | trim }}
       {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/consul/templates/mesh-gateway-podsecuritypolicy.yaml b/charts/consul/templates/mesh-gateway-podsecuritypolicy.yaml
index 04576fe926..56e4b7924c 100644
--- a/charts/consul/templates/mesh-gateway-podsecuritypolicy.yaml
+++ b/charts/consul/templates/mesh-gateway-podsecuritypolicy.yaml
@@ -1,4 +1,5 @@
 {{- if and .Values.global.enablePodSecurityPolicies .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -52,3 +53,4 @@ spec:
     rule: 'RunAsAny'
   readOnlyRootFilesystem: false
 {{- end }}
+{{- end }}
diff --git a/charts/consul/templates/mesh-gateway-service.yaml b/charts/consul/templates/mesh-gateway-service.yaml
index 5fdceca8df..80f82ac897 100644
--- a/charts/consul/templates/mesh-gateway-service.yaml
+++ b/charts/consul/templates/mesh-gateway-service.yaml
@@ -1,4 +1,5 @@
 {{- if and .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -31,3 +32,4 @@ spec:
   {{ tpl .Values.meshGateway.service.additionalSpec . | nindent 2 | trim }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/consul/templates/mesh-gateway-serviceaccount.yaml b/charts/consul/templates/mesh-gateway-serviceaccount.yaml
index 8c2da5ae06..b1a0661eaa 100644
--- a/charts/consul/templates/mesh-gateway-serviceaccount.yaml
+++ b/charts/consul/templates/mesh-gateway-serviceaccount.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.meshGateway.enabled }}
+{{- if not (mustHas "resource-apis" .Values.global.experiments) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -21,3 +22,4 @@ imagePullSecrets:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/consul/test/unit/gateway-resources-configmap.bats b/charts/consul/test/unit/gateway-resources-configmap.bats
index bf7800866c..df66606194 100644
--- a/charts/consul/test/unit/gateway-resources-configmap.bats
+++ b/charts/consul/test/unit/gateway-resources-configmap.bats
@@ -62,6 +62,7 @@ load _helpers
     local resources=$(helm template \
         -s templates/gateway-resources-configmap.yaml \
         --set 'connectInject.enabled=true' \
+        --set 'meshGateway.enabled=true' \
         --set 'global.experiments[0]=resource-apis' \
         --set 'ui.enabled=false' \
         . | tee /dev/stderr |
diff --git a/charts/consul/test/unit/helpers.bats b/charts/consul/test/unit/helpers.bats
index f8523a7220..b1a7c54cb6 100644
--- a/charts/consul/test/unit/helpers.bats
+++ b/charts/consul/test/unit/helpers.bats
@@ -431,18 +431,6 @@ load _helpers
   [[ "$output" =~ "When the value global.experiments.resourceAPIs is set, syncCatalog.enabled is currently unsupported." ]]
 }
 
-@test "connectInject/Deployment: fails if resource-apis is set and meshGateway is enabled" {
-  cd `chart_dir`
-  run helm template \
-      -s templates/tests/test-runner.yaml \
-      --set 'connectInject.enabled=true' \
-      --set 'global.experiments[0]=resource-apis' \
-      --set 'ui.enabled=false' \
-      --set 'meshGateway.enabled=true' .
-  [ "$status" -eq 1 ]
-  [[ "$output" =~ "When the value global.experiments.resourceAPIs is set, meshGateway.enabled is currently unsupported." ]]
-}
-
 @test "connectInject/Deployment: fails if resource-apis is set and ingressGateways is enabled" {
   cd `chart_dir`
   run helm template \