diff --git a/kibana/files/kibana.yml b/kibana/files/kibana.yml
index 951ff75..e7d6ab9 100644
--- a/kibana/files/kibana.yml
+++ b/kibana/files/kibana.yml
@@ -33,7 +33,7 @@
 # ca: /path/to/your/CA.pem
 
 # The default application to load.
-default_app_id: "discover"
+default_app_id: "{{ server.default_app_id }}"
 
 # Time in milliseconds to wait for elasticsearch to respond to pings, defaults to
 # request_timeout setting
@@ -76,4 +76,4 @@
  - plugins/settings/index
  - plugins/table_vis/index
  - plugins/vis_types/index
- - plugins/visualize/index
\ No newline at end of file
+ - plugins/visualize/index
diff --git a/kibana/map.jinja b/kibana/map.jinja
index 0a6540a..7f41e21 100644
--- a/kibana/map.jinja
+++ b/kibana/map.jinja
@@ -13,5 +13,6 @@
     host: 127.0.0.1
     port: 9200
     index: '.kibana'
+    default_app_id: discover
 {%- endload %}
 {%- set client = salt['grains.filter_by'](client_defaults, merge=salt['pillar.get']('kibana:client')) %}