diff --git a/charts/app-of-apps/templates/app-template.yaml b/charts/app-of-apps/templates/app-template.yaml
index a5bff6f..8031349 100644
--- a/charts/app-of-apps/templates/app-template.yaml
+++ b/charts/app-of-apps/templates/app-template.yaml
@@ -28,9 +28,9 @@ spec:
     server: {{ $.Values.destination.server }}
     namespace: {{ $v.namespace }}
   syncPolicy:
-    {{- if hasKey $v "selfHeal" | ternary $v.selfHeal false }}
+    {{- if (or ( hasKey $v "selfHeal" ) ( default false $v.autoSync) ) }}
     automated:
-      selfHeal: {{ hasKey $v "selfHeal" | ternary $v.selfHeal false }}
+      selfHeal: {{ default false $v.selfHeal }}
     {{- end }}
     {{- with $v.managedNamespaceMetadata }}
     managedNamespaceMetadata: