diff --git a/chart/kube-arangodb/templates/storage-operator/crd.yaml b/chart/kube-arangodb/templates/storage-operator/crd.yaml
index 487dec10f..b7c3a09f3 100644
--- a/chart/kube-arangodb/templates/storage-operator/crd.yaml
+++ b/chart/kube-arangodb/templates/storage-operator/crd.yaml
@@ -1,4 +1,5 @@
 {{ if .Values.operator.features.storage -}}
+{{ if .Values.operator.enableCRDManagement -}}
 
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -29,4 +30,5 @@ spec:
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
 
+{{- end }}
 {{- end }}
\ No newline at end of file