diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go
index d6ab1c9d372..dfb2cf045ed 100644
--- a/pkg/api/org_invite.go
+++ b/pkg/api/org_invite.go
@@ -74,6 +74,9 @@ func AddOrgInvite(c *m.ReqContext, inviteDto dtos.AddInviteForm) Response {
 		}
 
 		if err := bus.Dispatch(&emailCmd); err != nil {
+			if err == m.ErrSmtpNotEnabled {
+				return Error(412, err.Error(), err)
+			}
 			return Error(500, "Failed to send email invite", err)
 		}