diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index f3c6caa..807f53c 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,11 +46,13 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- if .Values.config.kafkasql.database.enabled -}}
-  {{- $kafkasql := .Values.config.kafkasql | deepCopy -}}
-  {{- $_ := unset $kafkasql "password" -}}
-  {{- $_ := unset $kafkasql "username" -}}
-  {{- $_ := set $config "kafkasql" $kafkasql -}}
+{{- if (hasKey .Values.config "kafkasql" ) }}
+  {{- if (hasKey .Values.config.kafkasql "database") }}
+    {{- $kafkasql := .Values.config.kafkasql.database | deepCopy -}}
+    {{- $_ := unset $kafkasql "password" -}}
+    {{- $_ := unset $kafkasql "username" -}}
+    {{- $_ := set $config "kafkasql" $kafkasql -}}
+  {{- end -}}
 {{- end -}}
 
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
@@ -283,18 +285,6 @@ conduktor: invalid database configuration
 {{- end -}}
 {{- end -}}
 
-{{- define "conduktor.validateValues.kafkasql" -}}
-{{- if .Values.config.kafkasql.database.enabled -}}
-    {{- if not .Values.config.kafkasql.database.host -}}
-conduktor: invalid kafkasql configuration
-           config.kafkasql.database.host MUST be set in values
-    {{- else if not .Values.config.kafkasql.database.name -}}
-conduktor: invalid kafkasql configuration
-           config.kafkasql.database.name MUST be set in values
-    {{- end -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "conduktor.validateValues.monitoring" -}}
 {{- if (.Values.config.monitoring).storage -}}
 conduktor: invalid monitoring storage configuration
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index f499a3f..9a98dc6 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,8 +23,14 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
-  {{- if .Values.config.kafkasql.database.enabled }}
-    CDK_KAFKASQL_DATABASE_PASSWORD: {{ required "config.kafkasql.database.password MUST be set in values" .Values.config.kafkasql.database.password | b64enc }}
-    CDK_KAFKASQL_DATABASE_USERNAME: {{ required "config.kafkasql.database.username MUST be set in values" .Values.config.kafkasql.database.username | b64enc }}
+  {{- if (hasKey .Values.config "kafkasql" ) }}
+    {{- if (hasKey .Values.config.kafkasql "database") }}
+      {{- if .Values.config.kafkasql.database.password }}
+      CDK_KAFKASQL_DATABASE_PASSWORD: {{.Values.config.kafkasql.database.password | b64enc }}
+      {{- end }}
+      {{- if .Values.config.kafkasql.database.username }}
+      CDK_KAFKASQL_DATABASE_USERNAME: {{ .Values.config.kafkasql.database.username | b64enc }}
+      {{- end }}
+    {{- end }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 4c033a6..7e80f80 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,7 +90,6 @@ config:
     password: ""
     username: ""
 
-  ## @param config.kafkasql.database.enabled Enable SQL database for Conduktor Console
   ## @param config.kafkasql.database.host Your Conduktor Console SQL Database host
   ## @param config.kafkasql.database.port Your Conduktor Console SQL Database port
   ## @param config.kafkasql.database.name Your Conduktor Console SQL Database name
@@ -104,7 +103,6 @@ config:
       name: "conduktor-sql"
       password: ""
       username: ""
-      enabled: false
 
   ## @param config.license Conduktor Console Enterprise license, if none given, the product will run in free tier
   license: ""