diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 0f364076a15..c715086a184 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -138,7 +138,7 @@ func (g *GrafanaServerImpl) Run() error {
 			err := service.Run(g.context)
 
 			// If error is not canceled then the service crashed
-			if err != context.Canceled {
+			if err != context.Canceled && err != nil {
 				g.log.Error("Stopped "+reflect.TypeOf(service).Elem().Name(), "reason", err)
 			} else {
 				g.log.Info("Stopped "+reflect.TypeOf(service).Elem().Name(), "reason", err)