diff --git a/src/dashboard/Dashboard.js b/src/dashboard/Dashboard.js
index 1afc6c031..61a7226a5 100644
--- a/src/dashboard/Dashboard.js
+++ b/src/dashboard/Dashboard.js
@@ -516,8 +516,8 @@ class Dashboard extends React.Component {
         <Route path="admin" element={<B4aAdminPage />} />
         {/* <Route path="app-templates" element={<B4aAppTemplates />} /> */}
 
-        <Route path="server-settings/" element={<ServerSettings />} />
-        <Route path="server-settings/:targetPage" element={<ServerSettings />} />
+        {/* <Route path="server-settings/" element={<ServerSettings />} /> */}
+        {/* <Route path="server-settings/:targetPage" element={<ServerSettings />} /> */}
         <Route path="domain-settings" element={<DomainSettings />} />
         <Route path="server-url-live-query" element={<ServerURLLiveQuery />} />
         <Route path="advanced-options" element={<CustomParseOptions />} />
diff --git a/src/dashboard/DashboardView.react.js b/src/dashboard/DashboardView.react.js
index 76b2c3a5b..cad4cb0cb 100644
--- a/src/dashboard/DashboardView.react.js
+++ b/src/dashboard/DashboardView.react.js
@@ -260,10 +260,10 @@ export default class DashboardView extends React.Component {
       link: '/settings/keys'
     });
     // }
-    settingsSections.push({
-      name: 'Server Settings',
-      link: '/server-settings',
-    });
+    // settingsSections.push({
+    //   name: 'Server Settings',
+    //   link: '/server-settings',
+    // });
 
     settingsSections.push({
       name: 'Domain Settings',
diff --git a/src/dashboard/Data/AppOverview/AppOverviewActions.react.js b/src/dashboard/Data/AppOverview/AppOverviewActions.react.js
index edece40f5..a92b35014 100644
--- a/src/dashboard/Data/AppOverview/AppOverviewActions.react.js
+++ b/src/dashboard/Data/AppOverview/AppOverviewActions.react.js
@@ -71,8 +71,8 @@ const AppOverviewActions = ({ appUrlName, context }) => {
         {isDropdownOpen && (
           <div className={`${styles.dropdownMenu} ${isDropdownOpen ? styles.open : ''}`}>
             <div className={styles.dropdownItem}>
-              <Link to={`/apps/${appUrlName}/server-settings`}>
-                Server Settings
+              <Link to={`/apps/${appUrlName}/settings/general`}>
+                App Settings
               </Link>
             </div>
             <div className={styles.dropdownItem} onClick={() => handleAction('refresh')}>