diff --git a/app.js b/app.js
index 8e029eb..a5c18c2 100644
--- a/app.js
+++ b/app.js
@@ -28,7 +28,6 @@ const { registerArenaHandlers } = require("./sockets/arena");
 const { registerChatHandlers } = require("./sockets/chat");
 const boosterRoutes = require("./routes/booster.route");
 const pointsRoutes  = require("./routes/points.route");
-const combineRoutes = require("./routes/combine.route");
 
 const compression = require("compression");
 
@@ -179,11 +178,7 @@ app.get("/api/building/:id", requireLogin, async (req, res) => {
     let building;
 
     if (!userBuilding.length) {
-      await db.query(
-        "INSERT INTO user_buildings (user_id,building_id,level,points) VALUES (?,?,1,0)",
-        [userId, buildingId],
-      );
-      building = { level: 1, points: 0 };
+      return res.status(404).json({ error: "Gebäude nicht gefunden" });
     } else {
       building = userBuilding[0];
     }
@@ -390,7 +385,6 @@ app.use("/arena", arenaRoutes);
 app.use("/api", boosterRoutes);
 app.use("/api", require("./routes/daily.route"));
 app.use("/api/points", pointsRoutes);
-app.use("/api", combineRoutes);
 
 /* ========================
    404 Handler
diff --git a/routes/register.route.js b/routes/register.route.js
index 8a395d5..a13534a 100644
--- a/routes/register.route.js
+++ b/routes/register.route.js
@@ -109,6 +109,15 @@ router.post("/", registerLimiter, async (req, res) => {
       [newAccountId]
     );
 
+    /* Alle Gebäude mit Level 1 anlegen */
+    const [buildings] = await db.query("SELECT id FROM buildings");
+    for (const building of buildings) {
+      await db.query(
+        "INSERT INTO user_buildings (user_id, building_id, level, points) VALUES (?, ?, 1, 0)",
+        [newAccountId, building.id]
+      );
+    }
+
     const verifyLink = `${process.env.APP_URL}/verify/${verifyToken}`;
     await mailer.sendMail({
       from: '"Dynasty of Knights" <register@dynastyofknights.com>',