diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
index 2b9dd4fd1b2..80fb674c67f 100644
--- a/pkg/services/alerting/notifiers/email.go
+++ b/pkg/services/alerting/notifiers/email.go
@@ -30,7 +30,7 @@ func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 
 	return &EmailNotifier{
 		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
-		Addresses:    strings.Split(addressesString, "\n"),
+		Addresses:    strings.Split(addressesString, `;`),
 		log:          log.New("alerting.notifier.email"),
 	}, nil
 }
diff --git a/pkg/services/alerting/notifiers/email_test.go b/pkg/services/alerting/notifiers/email_test.go
index 19dcf23c3d2..9750cbc2833 100644
--- a/pkg/services/alerting/notifiers/email_test.go
+++ b/pkg/services/alerting/notifiers/email_test.go
@@ -47,6 +47,33 @@ func TestEmailNotifier(t *testing.T) {
 				So(emailNotifier.Type, ShouldEqual, "email")
 				So(emailNotifier.Addresses[0], ShouldEqual, "ops@grafana.org")
 			})
+
+			Convey("from settings with two emails", func() {
+				json := `
+				{
+					"addresses": "ops@grafana.org;dev@grafana.org"
+				}`
+
+				settingsJSON, err := simplejson.NewJson([]byte(json))
+				So(err, ShouldBeNil)
+
+				model := &m.AlertNotification{
+					Name:     "ops",
+					Type:     "email",
+					Settings: settingsJSON,
+				}
+
+				not, err := NewEmailNotifier(model)
+				emailNotifier := not.(*EmailNotifier)
+
+				So(err, ShouldBeNil)
+				So(emailNotifier.Name, ShouldEqual, "ops")
+				So(emailNotifier.Type, ShouldEqual, "email")
+				So(len(emailNotifier.Addresses), ShouldEqual, 2)
+
+				So(emailNotifier.Addresses[0], ShouldEqual, "ops@grafana.org")
+				So(emailNotifier.Addresses[1], ShouldEqual, "dev@grafana.org")
+			})
 		})
 	})
 }