diff --git a/config/routes.rb b/config/routes.rb
index cf39ca3384d25544dde2ae747b666b919a1e9b76..466555eeee81c2c601b9c04fe5b498abf63ca4e9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -133,6 +133,9 @@
         get :kill
       end
     end
+
+    # Notification settings
+    resources :notification_settings, only: [:create, :update]
   end
 
   concern :clusterable do
@@ -181,9 +184,6 @@
   # Spam reports
   resources :abuse_reports, only: [:new, :create]
 
-  # Notification settings
-  resources :notification_settings, only: [:create, :update]
-
   resources :groups, only: [:index, :new, :create] do
     post :preview_markdown
   end
diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md
index b160cb03f94eb551157efc10ce54f9ab7ae3449b..3e53bc0fd81266d1ecd8dfadb4269d7fde14a552 100644
--- a/doc/user/reserved_names.md
+++ b/doc/user/reserved_names.md
@@ -69,7 +69,6 @@ Currently the following names are reserved as top level groups:
 - `invites`
 - `jwt`
 - `login`
-- `notification_settings`
 - `oauth`
 - `profile`
 - `projects`
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index db094bfe973d0fc208efd1b5d3b5e71a4b4e41c1..5fa0fbf874c231951c265a35a2483478dd0bcb9e 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -42,7 +42,6 @@ module PathRegex
       invites
       jwt
       login
-      notification_settings
       oauth
       profile
       projects