diff --git a/pkg/middleware/recovery.go b/pkg/middleware/recovery.go
index 760a809109f..730f2ba6843 100644
--- a/pkg/middleware/recovery.go
+++ b/pkg/middleware/recovery.go
@@ -133,10 +133,11 @@ func Recovery(cfg *setting.Cfg) web.Handler {
 
 				data := struct {
 					Title     string
+					AppTitle  string
 					AppSubUrl string
 					Theme     string
 					ErrorMsg  string
-				}{"Server Error", cfg.AppSubURL, cfg.DefaultTheme, ""}
+				}{"Server Error", "Grafana", cfg.AppSubURL, cfg.DefaultTheme, ""}
 
 				if setting.Env == setting.Dev {
 					if err, ok := r.(error); ok {
diff --git a/pkg/models/context.go b/pkg/models/context.go
index 5a7a87c315e..dca3b2e5310 100644
--- a/pkg/models/context.go
+++ b/pkg/models/context.go
@@ -30,10 +30,11 @@ type ReqContext struct {
 func (ctx *ReqContext) Handle(cfg *setting.Cfg, status int, title string, err error) {
 	data := struct {
 		Title     string
+		AppTitle  string
 		AppSubUrl string
 		Theme     string
 		ErrorMsg  error
-	}{title, cfg.AppSubURL, "dark", nil}
+	}{title, "Grafana", cfg.AppSubURL, "dark", nil}
 	if err != nil {
 		ctx.Logger.Error(title, "error", err)
 		if setting.Env != setting.Prod {
diff --git a/public/views/error-template.html b/public/views/error-template.html
index 6e98c6be7bb..0f785120ce1 100644
--- a/public/views/error-template.html
+++ b/public/views/error-template.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta name="theme-color" content="#000" />
 
-    <title>Grafana - Error</title>
+    <title>[[.AppTitle]] - Error</title>
 
     <base href="[[.AppSubUrl]]/" />