diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ed85778c2c9..f0f5e323631 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -120,6 +120,7 @@ error404 = The page you are trying to reach either <strong>does not exist</stron
 error503 = The server was unable to complete your request. Please try again later.
 go_back = Go Back
 invalid_data = Invalid data: %v
+nothing_has_been_changed = Nothing has been changed.
 
 never = Never
 unknown = Unknown
@@ -2844,7 +2845,6 @@ settings.change_visibility = Change Visibility
 settings.invalid_visibility = The new visibility is not valid.
 settings.change_visibility_notices_1 = If the organization is converted to private, the repository stars will be removed and cannot be restored.
 settings.change_visibility_notices_2 = Non-members will lose access to the organization’s repositories if visibility is changed to private.
-settings.change_visibility_no_change = You did not make any changes to visibility.
 settings.change_visibility_success = The visibility of organization %s has been successfully changed.
 settings.visibility_desc = Change who can view the organization and its repositories.
 settings.visibility.public = Public
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index abf54aba29f..cef0a66e143 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -235,12 +235,14 @@ func SettingsRenamePost(ctx *context.Context) {
 func SettingsChangeVisibilityPost(ctx *context.Context) {
 	visibility := structs.VisibilityModes[ctx.FormString("visibility")]
 	if !visibility.IsValid() {
-		ctx.JSONError(ctx.Tr("org.settings.invalid_visibility"))
+		ctx.Flash.Error(ctx.Tr("invalid_data", visibility))
+		ctx.JSONRedirect(setting.AppSubURL + "/org/" + url.PathEscape(ctx.Org.Organization.Name) + "/settings")
 		return
 	}
 
 	if ctx.Org.Organization.Visibility == visibility {
-		ctx.JSONError(ctx.Tr("org.settings.change_visibility_no_change"))
+		ctx.Flash.Info(ctx.Tr("nothing_has_been_changed"))
+		ctx.JSONRedirect(setting.AppSubURL + "/org/" + url.PathEscape(ctx.Org.Organization.Name) + "/settings")
 		return
 	}