diff --git a/package-lock.json b/package-lock.json
index 0bc233fa..e08b66f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,8 +9,8 @@
       "version": "0.0.0",
       "dependencies": {
         "@ethersphere/bee-js": "^8.1.0",
-        "@solarpunkltd/comment-system": "^1.2.1",
-        "@solarpunkltd/comment-system-ui": "^0.1.6",
+        "@solarpunkltd/comment-system": "^1.3.0",
+        "@solarpunkltd/comment-system-ui": "^0.1.9",
         "@solarpunkltd/swarm-decentralized-chat": "^0.1.13",
         "clsx": "^2.1.1",
         "dotenv": "^16.4.5",
@@ -2309,24 +2309,26 @@
       "dev": true
     },
     "node_modules/@solarpunkltd/comment-system": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@solarpunkltd/comment-system/-/comment-system-1.2.1.tgz",
-      "integrity": "sha512-CS92CWW5pub1UJ9k/3QNbJkaLyS8niU78CcPbd/y972Rdw1n9YQLBjKEUNjkYFevmtjDZYFGx4rWLxRmpounuw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@solarpunkltd/comment-system/-/comment-system-1.3.0.tgz",
+      "integrity": "sha512-IKPURDEUTEM0VLwe82HXGr/N1fvGSqv6pJgtGGpBgDHm0YmfkD8gZUXAEoL/ZIn/OsK3Mz4EvwWgPHudNqPaPQ==",
+      "license": "ISC",
       "dependencies": {
-        "@ethersphere/bee-js": "^8.1.0",
+        "@ethersphere/bee-js": "^8.3.1",
         "cafe-utility": "^21.3.1",
         "ethers": "^6.13.3",
+        "nock": "^13.5.6",
         "uuid": "^9.0.1",
         "vite-plugin-node-polyfills": "^0.22.0"
       }
     },
     "node_modules/@solarpunkltd/comment-system-ui": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/@solarpunkltd/comment-system-ui/-/comment-system-ui-0.1.7.tgz",
-      "integrity": "sha512-okhlRCOodl9GX2LVK/25vVVBTp3oM1f365/MQAteGsh3DXz0fRlp76FP76oEVX/R4V95YNLzdAb78ORf67x9Cw==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@solarpunkltd/comment-system-ui/-/comment-system-ui-0.1.9.tgz",
+      "integrity": "sha512-GRndc6SB3LqVV3MhbOb6WrHt/t6M5RXSqZM6voQPrHuToiRFRXRwLm2f5U0EvNSUDdlJxuPkAQgmk2g/1hkWDA==",
       "dependencies": {
-        "@ethersphere/bee-js": "^8.1.0",
-        "@solarpunkltd/comment-system": "^1.2.1",
+        "@ethersphere/bee-js": "^8.3.1",
+        "@solarpunkltd/comment-system": "^1.3.0",
         "clsx": "^2.1.1",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
@@ -3628,7 +3630,6 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
       "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "dev": true,
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -5681,6 +5682,12 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "license": "ISC"
+    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -5877,8 +5884,7 @@
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/multiformats": {
       "version": "9.9.0",
@@ -5908,6 +5914,20 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "node_modules/nock": {
+      "version": "13.5.6",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.6.tgz",
+      "integrity": "sha512-o2zOYiCpzRqSzPj0Zt/dQ/DqZeYoaQ7TUonc/xUPjCGl9WeHpNbxgVvOquXYAaJzI0M9BXV3HTzG0p8IUAbBTQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "propagate": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      }
+    },
     "node_modules/node-addon-api": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
@@ -6466,6 +6486,15 @@
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/propagate": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz",
+      "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
diff --git a/package.json b/package.json
index 110acfe9..6722d3d3 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@ethersphere/bee-js": "^8.1.0",
-    "@solarpunkltd/comment-system-ui": "^0.1.6",
-    "@solarpunkltd/comment-system": "^1.2.1",
+    "@solarpunkltd/comment-system-ui": "^0.1.9",
+    "@solarpunkltd/comment-system": "^1.3.0",
     "@solarpunkltd/swarm-decentralized-chat": "^0.1.13",
     "clsx": "^2.1.1",
     "dotenv": "^16.4.5",
diff --git a/src/router.tsx b/src/router.tsx
index 42e4a873..8e1341ee 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -17,7 +17,7 @@ import Intro from "./pages/Intro/Intro";
 import NotesPage from "./pages/Notes/Notes";
 import Profile from "./pages/Profile/Profile";
 import ProfileCreation from "./pages/ProfileCreation/ProfileCreation";
-import SpacesPage from "./pages/Spaces/Spaces";
+import Spaces from "./pages/Spaces/Spaces";
 import StayUpdated from "./pages/StayUpdated/StayUpdated";
 import TACOnboardingPage from "./pages/TACOnboarding/TACOnboarding";
 import TalkPage from "./pages/Talk/Talk";
@@ -485,7 +485,7 @@ const MainRouter = (): ReactElement => {
         />
         <Route path={ROUTES.PROFILE} element={<Profile />} />
         <Route path={ROUTES.AGENDA} element={<Agenda />} />
-        <Route path={ROUTES.SPACES} element={<SpacesPage />} />
+        <Route path={ROUTES.SPACES} element={<Spaces />} />
         <Route
           path={ROUTES.HOWDOESITWORK}
           element={
diff --git a/src/utils/bee.ts b/src/utils/bee.ts
index 281e37da..50600e83 100644
--- a/src/utils/bee.ts
+++ b/src/utils/bee.ts
@@ -79,7 +79,7 @@ export async function updateFeed(
   }
 }
 
-// adds "live_x" suffix to the topic if raw is true, so that topics can be versioned if needed
+// adds ENV suffix to the topic if raw is true, so that dev and prod topics can be separated
 export function getTopic(topic: string, raw: boolean): string {
   if (raw) {
     return topic + process.env.ENV;
diff --git a/vite.config.ts b/vite.config.ts
index 6b104b77..fe900037 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -34,6 +34,7 @@ export default defineConfig(({ mode }) => {
         ),
       "process.env.GATEWAY": JSON.stringify(env.GATEWAY) ?? JSON.stringify(""),
       "process.versions": JSON.stringify({ node: "browser-mock" }), // Mocking process.versions.node
+      "process.env.ENV": JSON.stringify(env.ENV) ?? JSON.stringify("dev"),
     },
     plugins: [
       react(),