diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go
index b6ddb5e6670..919bb6fd026 100644
--- a/pkg/services/sqlstore/org.go
+++ b/pkg/services/sqlstore/org.go
@@ -133,10 +133,16 @@ func UpdateOrg(cmd *m.UpdateOrgCommand) error {
 			Updated: time.Now(),
 		}
 
-		if _, err := sess.Id(cmd.OrgId).Update(&org); err != nil {
+		affectedRows, err := sess.Id(cmd.OrgId).Update(&org)
+
+		if err != nil {
 			return err
 		}
 
+		if affectedRows == 0 {
+			return m.ErrOrgNotFound
+		}
+
 		sess.publishAfterCommit(&events.OrgUpdated{
 			Timestamp: org.Updated,
 			Id:        org.Id,