diff --git a/pkg/services/alerting/alerting.go b/pkg/services/alerting/alerting.go
index 328bccb5db3..93e45d4ca4f 100644
--- a/pkg/services/alerting/alerting.go
+++ b/pkg/services/alerting/alerting.go
@@ -107,6 +107,8 @@ func (this *Scheduler) HandleResponses() {
 
 		if cmd.NewState != m.AlertStateOk {
 			cmd.Info = fmt.Sprintf("Actual value: %1.2f", response.ActualValue)
+		} else {
+			cmd.Info = "Alert is OK!"
 		}
 
 		if err := bus.Dispatch(&cmd); err != nil {
diff --git a/pkg/services/sqlstore/alert_state.go b/pkg/services/sqlstore/alert_state.go
index ab357a54139..d2f3d4a4265 100644
--- a/pkg/services/sqlstore/alert_state.go
+++ b/pkg/services/sqlstore/alert_state.go
@@ -29,9 +29,9 @@ func SetNewAlertState(cmd *m.UpdateAlertStateCommand) error {
 			return err
 		}
 
-		//if alert.State == cmd.NewState {
-		//	return nil
-		//}
+		if alert.State == cmd.NewState {
+			return nil
+		}
 
 		alert.State = cmd.NewState
 		sess.Id(alert.Id).Update(&alert)
diff --git a/public/app/features/alerts/alert_def.ts b/public/app/features/alerts/alert_def.ts
index 2cb48c174cc..3bf6924bc93 100644
--- a/public/app/features/alerts/alert_def.ts
+++ b/public/app/features/alerts/alert_def.ts
@@ -1,7 +1,5 @@
 ///<reference path="../../headers/common.d.ts" />
 
-//import _ from 'lodash';
-
 var alertStateToCssMap = {
   "OK": "icon-gf-online alert-icon-online",
   "WARN": "icon-gf-warn alert-icon-warn",