diff --git a/charts/pgadmin4/Chart.yaml b/charts/pgadmin4/Chart.yaml
index d4efcac8..742f38c0 100644
--- a/charts/pgadmin4/Chart.yaml
+++ b/charts/pgadmin4/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: pgAdmin4 is a web based administration tool for PostgreSQL database
 name: pgadmin4
-version: 1.21.0
+version: 1.21.1
 appVersion: "8.1"
 keywords:
   - pgadmin
diff --git a/charts/pgadmin4/templates/deployment.yaml b/charts/pgadmin4/templates/deployment.yaml
index e641c428..d8653bb2 100644
--- a/charts/pgadmin4/templates/deployment.yaml
+++ b/charts/pgadmin4/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-    {{- if or (not .Values.existingSecret) .Values.podAnnotations .Values.templatedPodAnnotations .Values.serverDefinitions.enabled }}
+    {{- if or (not .Values.existingSecret) .Values.podAnnotations .Values.templatedPodAnnotations }}
       annotations:
       {{- if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
@@ -40,12 +40,6 @@ spec:
       {{- if not .Values.existingSecret }}
         checksum/secret: {{ include (print $.Template.BasePath "/auth-secret.yaml") . | sha256sum }}
       {{- end }}
-      {{- if and .Values.serverDefinitions.enabled ( eq .Values.serverDefinitions.resourceType "Secret" ) }}
-        checksum/secret-server-definitions: {{ include (print $.Template.BasePath "/server-definitions-secret.yaml") . | sha256sum }}
-      {{- end }}
-      {{- if and .Values.serverDefinitions.enabled ( ne .Values.serverDefinitions.resourceType "Secret" ) }}
-        checksum/config-server-definitions: {{ include (print $.Template.BasePath "/server-definitions-configmap.yaml") . | sha256sum }}
-      {{- end }}
     {{- end }}
 
     spec:
diff --git a/charts/pgadmin4/values.yaml b/charts/pgadmin4/values.yaml
index bb2e3517..5730b70b 100644
--- a/charts/pgadmin4/values.yaml
+++ b/charts/pgadmin4/values.yaml
@@ -69,6 +69,8 @@ strategy: {}
 
 ## Server definitions will be loaded at launch time. This allows connection
 ## information to be pre-loaded into the instance of pgAdmin4 in the container.
+## Note that server definitions are only loaded on first launch, 
+## i.e. when the configuration database is created, and not on subsequent launches using the same configuration database.
 ## Ref: https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html
 ##
 serverDefinitions: