diff --git a/web/next.config.js b/web/next.config.js
index bb721e8d1..423e8273f 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /** @type {import("next").NextConfig} */
 require("dotenv").config({ path: ".env" });
+const path = require("path");
+
 const { withSentryConfig } = require("@sentry/nextjs");
 const withPWA = require("next-pwa")({
   dest: "public",
@@ -34,6 +36,13 @@ const nextConfig = {
     ],
     unoptimized: true,
   },
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      // Ensure that all imports of 'yjs' resolve to the same instance
+      config.resolve.alias["yjs"] = path.resolve(__dirname, "node_modules/yjs");
+    }
+    return config;
+  },
   async redirects() {
     return [
       {