diff --git a/CHANGELOG b/CHANGELOG
index e8563d83ba..5fc9ac6bff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 v3.5.3 (XXXX-XX-XX)
 -------------------
 
+* Stop putting system services in _apps on single server, this has never
+  worked on cluster and was not needed.
+
 * Fixed issue #10371: K_SHORTEST_PATHS LIMIT 1 can not return the shortest path.
   Now the shortest path is returned as the first one in such queries.
 
diff --git a/js/server/modules/@arangodb/foxx/manager.js b/js/server/modules/@arangodb/foxx/manager.js
index b729c8827f..368726b5ff 100644
--- a/js/server/modules/@arangodb/foxx/manager.js
+++ b/js/server/modules/@arangodb/foxx/manager.js
@@ -284,50 +284,12 @@ function cleanupOrphanedServices (knownServicePaths, knownBundlePaths) {
 }
 
 function startup () {
-  if (isFoxxmaster()) {
-    const db = require('internal').db;
-    const dbName = db._name();
-    try {
-      db._useDatabase('_system');
-      const databases = db._databases();
-      for (const name of databases) {
-        try {
-          db._useDatabase(name);
-          upsertSystemServices();
-        } catch (e) {
-          console.warnStack(e);
-        }
-      }
-    } finally {
-      db._useDatabase(dbName);
-    }
-  }
   if (global.ArangoServerState.role() === 'SINGLE') {
     commitLocalState(true);
   }
   selfHealAll();
 }
 
-function upsertSystemServices () {
-  const serviceDefinitions = new Map();
-  for (const mount of SYSTEM_SERVICE_MOUNTS) {
-    try {
-      const serviceDefinition = utils.getServiceDefinition(mount) || {mount};
-      const service = FoxxService.create(serviceDefinition);
-      serviceDefinitions.set(mount, service.toJSON());
-    } catch (e) {
-      console.errorStack(e);
-    }
-  }
-  db._query(aql`
-    FOR item IN ${Array.from(serviceDefinitions)}
-    UPSERT {mount: item[0]}
-    INSERT item[1]
-    REPLACE item[1]
-    IN ${utils.getStorage()}
-  `);
-}
-
 function commitLocalState (replace) {
   let modified = false;
   const rootPath = FoxxService.rootPath();