diff --git a/bitnami/kibana/Chart.yaml b/bitnami/kibana/Chart.yaml
index 2df7eaff3..90442143e 100644
--- a/bitnami/kibana/Chart.yaml
+++ b/bitnami/kibana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kibana
-version: 5.3.4
+version: 5.3.5
 appVersion: 7.8.0
 description: Kibana is an open source, browser based analytics and search dashboard for Elasticsearch.
 keywords:
diff --git a/bitnami/kibana/templates/configmap.yaml b/bitnami/kibana/templates/configmap.yaml
index 9179914b9..7adb51774 100644
--- a/bitnami/kibana/templates/configmap.yaml
+++ b/bitnami/kibana/templates/configmap.yaml
@@ -10,7 +10,9 @@ data:
     server.host: "::"
     server.port: 5601
     elasticsearch.hosts: [{{ include "kibana.elasticsearch.url" . }}]
+    {{- if .Values.configuration.server.basePath }}
     server.basePath: {{ .Values.configuration.server.basePath | quote }}
+    {{- end }}
     server.rewriteBasePath: {{ .Values.configuration.server.rewriteBasePath }}
     {{- if .Values.extraConfiguration }}
     {{- tpl (toYaml .Values.extraConfiguration) $ | nindent 4 }}