diff --git a/charts/public-enemy/Chart.yaml b/charts/public-enemy/Chart.yaml
index dfb743e..eb966a5 100644
--- a/charts/public-enemy/Chart.yaml
+++ b/charts/public-enemy/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.5.8
+version: 0.5.9
 appVersion: "2.0.0"
diff --git a/charts/public-enemy/templates/api/deployment.yaml b/charts/public-enemy/templates/api/deployment.yaml
index 269d8ca..8c5becc 100644
--- a/charts/public-enemy/templates/api/deployment.yaml
+++ b/charts/public-enemy/templates/api/deployment.yaml
@@ -26,13 +26,14 @@ spec:
       serviceAccountName: {{ include "publicEnemy.api.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.api.podSecurityContext | nindent 8 }}
-
+      {{- if .Values.postgresql.enabled }}
       initContainers:
         - name: check-db-ready
           image: postgres:11.6
           command: ['sh', '-c', 
             until pg_isready -h {{ include "publicEnemy.postgresql.fullname" . }} -p {{ .Values.postgresql.auth.port}}; 
             do echo waiting for database; sleep 2; done;]
+       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext: