diff --git a/conf/defaults.ini b/conf/defaults.ini
index 1de2545251c..b0de259de19 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -570,7 +570,7 @@ callback_url =
 
 [panels]
 enable_alpha = false
-sanitize_input = true
+disable_sanitize_input = false
 
 [enterprise]
 license_path =
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 47ad9a04b27..adf7e83325e 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -166,7 +166,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
 		"externalUserMngLinkUrl":     setting.ExternalUserMngLinkUrl,
 		"externalUserMngLinkName":    setting.ExternalUserMngLinkName,
 		"viewersCanEdit":             setting.ViewersCanEdit,
-		"sanitizeInput":              hs.Cfg.SanitizeInput,
+		"disableSanitizeInput":       hs.Cfg.DisableSanitizeInput,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 8048d19df13..1f9db6fbb78 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -90,7 +90,7 @@ var (
 	EmailCodeValidMinutes            int
 	DataProxyWhiteList               map[string]bool
 	DisableBruteForceLoginProtection bool
-	SanitizeInput                    bool
+	DisableSanitizeInput             bool
 
 	// Snapshots
 	ExternalSnapshotUrl   string
@@ -223,7 +223,7 @@ type Cfg struct {
 	MetricsEndpointBasicAuthUsername string
 	MetricsEndpointBasicAuthPassword string
 	EnableAlphaPanels                bool
-	SanitizeInput                    bool
+	DisableSanitizeInput             bool
 	EnterpriseLicensePath            string
 }
 
@@ -711,7 +711,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 
 	panels := iniFile.Section("panels")
 	cfg.EnableAlphaPanels = panels.Key("enable_alpha").MustBool(false)
-	cfg.SanitizeInput = panels.Key("sanitize_input").MustBool(true)
+	cfg.DisableSanitizeInput = panels.Key("sanitize_input_disabled").MustBool(false)
 
 	cfg.readSessionConfig()
 	cfg.readSmtpSettings()
diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index 3c7966850fa..ce7f0fcfe50 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -35,7 +35,7 @@ export class Settings {
   loginHint: any;
   loginError: any;
   viewersCanEdit: boolean;
-  sanitizeInput: boolean;
+  disableSanitizeInput: boolean;
 
   constructor(options: Settings) {
     const defaults = {
@@ -53,7 +53,7 @@ export class Settings {
         isEnterprise: false,
       },
       viewersCanEdit: false,
-      sanitizeInput: true
+      disableSanitizeInput: false
     };
 
     _.extend(this, defaults, options);