diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 87e252a8..5460ca58 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.5
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.11.1
+version: 3.12.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
+    - "[Changed]: Use semverCompare to decide if the staticassets flag should be passed if server.staticAssets.enabled is nil"
+    - "[Changed]: Set server.staticAssets.enabled=~ to use the default semverCompare"
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index ff86f5ec..57c9079b 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -42,10 +42,15 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
         command:
         - argocd-server
-        {{ if .Values.server.staticAssets.enabled }}
+        {{- if .Values.server.staticAssets.enabled }}
         - --staticassets
         - /shared/app
-        {{ end }}
+        {{- else if eq (toString .Values.server.staticAssets.enabled) "<nil>" }}
+        {{- if semverCompare "< 2.1.0-0" (default .Values.global.image.tag .Values.server.image.tag) }}
+        - --staticassets
+        - /shared/app
+        {{- end }}
+        {{- end }}
         - --repo-server
         - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
         {{- if .Values.dex.enabled }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 06232342..e8d1483d 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -432,8 +432,9 @@ server:
   #  - --insecure
 
   # This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app
+  # If a nil value (~) is specified the chart uses semverCompare to enable the flag based on the argocd-server version
   staticAssets:
-    enabled: true
+    enabled: ~
 
   ## Environment variables to pass to argocd-server
   ##