diff --git a/routers/user/setting.go b/routers/user/setting.go
index b9d6c81e2..9138ba04b 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -442,11 +442,13 @@ func SettingsOrganizations(ctx *context.Context) {
 
 func SettingsLeaveOrganization(ctx *context.Context) {
 	err := models.RemoveOrgUser(ctx.QueryInt64("id"), ctx.User.ID)
-	if models.IsErrLastOrgOwner(err) {
-		ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
-	} else {
-		ctx.Handle(500, "RemoveOrgUser", err)
-		return
+	if err != nil {
+		if models.IsErrLastOrgOwner(err) {
+			ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
+		} else {
+			ctx.Handle(500, "RemoveOrgUser", err)
+			return
+		}
 	}
 
 	ctx.JSON(200, map[string]interface{}{