diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts
index 286f03db5f5..ced6ffc6467 100644
--- a/public/app/core/services/alert_srv.ts
+++ b/public/app/core/services/alert_srv.ts
@@ -27,10 +27,9 @@ export class AlertSrv {
       this.set(alert[0], alert[1], 'success', 3000);
     }, this.$rootScope);
 
-    appEvents.on('alert-error', options => {
-      this.set(options[0], options[1], 'error', 7000);
-    });
-
+    appEvents.on('alert-warning', options => this.set(options[0], options[1], 'warning', 5000));
+    appEvents.on('alert-success', options => this.set(options[0], options[1], 'success', 3000));
+    appEvents.on('alert-error', options => this.set(options[0], options[1], 'error', 7000));
     appEvents.on('confirm-modal', this.showConfirmModal.bind(this));
   }