diff --git a/charts/flyte-core/templates/propeller/configmap.yaml b/charts/flyte-core/templates/propeller/configmap.yaml
index 80019b13616..957a68e36f7 100644
--- a/charts/flyte-core/templates/propeller/configmap.yaml
+++ b/charts/flyte-core/templates/propeller/configmap.yaml
@@ -9,9 +9,15 @@ data:
 {{- with .Values.configmap.admin }}
   admin.yaml: | {{ tpl (toYaml .) $ | nindent 4 }}
 {{- end }}
+{{- if .Values.datacatalog.enabled }}
 {{- with .Values.configmap.catalog }}
   catalog.yaml: | {{ tpl (toYaml .) $ | nindent 4 }}
 {{- end }}
+{{- else }}
+  catalog.yaml: |
+    catalog-cache:
+      type: noop
+{{- end }}
 {{- with .Values.configmap.catalog_cache }}
   catalog_cache.yaml: | {{ tpl (toYaml .) $ | nindent 4 }}
 {{- end }}