diff --git a/bitnami/kibana/templates/NOTES.txt b/bitnami/kibana/templates/NOTES.txt
index cd2277501..0576c2afb 100644
--- a/bitnami/kibana/templates/NOTES.txt
+++ b/bitnami/kibana/templates/NOTES.txt
@@ -1,5 +1,16 @@
-** Please be patient while the chart is being deployed **
+{{- if or (not .Values.elasticsearch.hosts) (not .Values.elasticsearch.port) -}}
+######################################################################################################
+### ERROR: You did not provide the Elasticsearch external host or port in your 'helm install' call ###
+######################################################################################################
 
+Complete your Kibana deployment by running:
+
+  helm upgrade {{ .Release.Name }} bitnami/kibana \
+    --set elasticsearch.hosts[0]=YOUR_ES_HOST,elasticsearch.port=YOUR_ES_PORT
+
+Replacing "YOUR_ES_HOST" and "YOUR_ES_PORT" placeholders by the proper values of your Elasticsearch deployment.
+
+{{- else -}}
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
@@ -41,3 +52,4 @@ WARNING: For Prometheus metrics to work, make sure that the kibana-prometheus-ex
 {{- end }}
 
 {{ include "kibana.validateValues" . }}
+{{- end }}
diff --git a/bitnami/kibana/templates/configmap.yml b/bitnami/kibana/templates/configmap.yml
index da461583e..d77084bba 100644
--- a/bitnami/kibana/templates/configmap.yml
+++ b/bitnami/kibana/templates/configmap.yml
@@ -1,4 +1,4 @@
-{{- if not .Values.configurationCM }}
+{{- if and (not .Values.configurationCM) (and .Values.elasticsearch.hosts .Values.elasticsearch.port) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -13,4 +13,4 @@ data:
     {{- if .Values.extraConfiguration }}
     {{- tpl (toYaml .Values.extraConfiguration) $ | nindent 4 }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/bitnami/kibana/templates/deployment.yaml b/bitnami/kibana/templates/deployment.yaml
index 15df1888e..02a9a012a 100644
--- a/bitnami/kibana/templates/deployment.yaml
+++ b/bitnami/kibana/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if and .Values.elasticsearch.hosts .Values.elasticsearch.port -}}
 apiVersion: {{ template "kibana.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
@@ -184,3 +185,4 @@ spec:
       tolerations:
       {{- tpl (toYaml .Values.tolerations) $ | nindent 6 }}
       {{- end }}
+{{- end }}