diff --git a/backend/lib/robots/roborock/RoborockS6ValetudoRobot.js b/backend/lib/robots/roborock/RoborockS6ValetudoRobot.js
index 00a0d48e6b3..064378b9332 100644
--- a/backend/lib/robots/roborock/RoborockS6ValetudoRobot.js
+++ b/backend/lib/robots/roborock/RoborockS6ValetudoRobot.js
@@ -25,7 +25,6 @@ class RoborockS6ValetudoRobot extends RoborockValetudoRobot {
         }));
 
         [
-            capabilities.RoborockMapSnapshotCapability,
             capabilities.RoborockMultiMapPersistentMapControlCapability,
             capabilities.RoborockMultiMapMapResetCapability,
             capabilities.RoborockMapSegmentationCapability,
diff --git a/backend/lib/webserver/capabilityRouters/MapSnapshotCapabilityRouter.js b/backend/lib/webserver/capabilityRouters/MapSnapshotCapabilityRouter.js
index 11dc12757e9..6e297910134 100644
--- a/backend/lib/webserver/capabilityRouters/MapSnapshotCapabilityRouter.js
+++ b/backend/lib/webserver/capabilityRouters/MapSnapshotCapabilityRouter.js
@@ -4,7 +4,11 @@ const ValetudoMapSnapshot = require("../../entities/core/ValetudoMapSnapshot");
 class MapSnapshotCapabilityRouter extends CapabilityRouter {
     initRoutes() {
         this.router.get("/", async (req, res) => {
-            res.json(await this.capability.getSnapshots());
+            try {
+                res.json(await this.capability.getSnapshots());
+            } catch (e) {
+                this.sendErrorResponse(req, res, e);
+            }
         });
 
         this.router.put("/", this.validator, async (req, res) => {