diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml
index c693d079..6085d76d 100755
--- a/charts/argo-cd/templates/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-secret.yaml
@@ -2,14 +2,16 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: argocd-secret
-  labels: 
+  labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
 type: Opaque
-data:  
+{{- if or .Values.config.webhook.githubSecret (or .Values.config.webhook.gitlabSecret .Values.config.webhook.bitbucketSecret) }}
+Setting a blank data again will wipe admin password/key/cert
+data:
 {{- if .Values.config.webhook.githubSecret }}
   github.webhook.secret: {{ .Values.config.webhook.githubSecret }}
 {{- end }}
@@ -18,4 +20,5 @@ data:
 {{- end }}
 {{- if .Values.config.webhook.bitbucketSecret }}
   bitbucket.webhook.uuid: {{ .Values.config.webhook.bitbucketSecret }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end}}