diff --git a/salt/grafana/templates/manint.json b/salt/grafana/templates/manint.json
index cd88214ae..22015d274 100644
--- a/salt/grafana/templates/manint.json
+++ b/salt/grafana/templates/manint.json
@@ -1,14 +1,19 @@
 {
     "allValue": null,
-    "current": {},
+    "current": {
+      "selected": true,
+      "tags": [],
+      "text": [],
+      "value": []      
+    },
     "datasource": "InfluxDB",
     "definition": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "description": null,
     "error": null,
     "hide": 2,
-    "includeAll": false,
+    "includeAll": true,
     "label": "Management Interface",
-    "multi": false,
+    "multi": true,
     "name": "manint",
     "options": [],
     "query": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
diff --git a/salt/grafana/templates/monint.json b/salt/grafana/templates/monint.json
index b51ff5a61..417ea8e62 100644
--- a/salt/grafana/templates/monint.json
+++ b/salt/grafana/templates/monint.json
@@ -1,14 +1,19 @@
 {
     "allValue": null,
-    "current": {},
+    "current": {
+      "selected": true,
+      "tags": [],
+      "text": [],
+      "value": []      
+    },
     "datasource": "InfluxDB",
     "definition": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "description": null,
     "error": null,
     "hide": 2,
-    "includeAll": false,
+    "includeAll": true,
     "label": "Monitor Interface",
-    "multi": false,
+    "multi": true,
     "name": "monint",
     "options": [],
     "query": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",