diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
index cc99af1f7..e37a3b567 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt
@@ -37,20 +37,21 @@ internal fun Project.configureKotlinMultiplatform() {
         jvm()
         androidTarget()
 
-        js {
-            browser {
-                testTask {
-                    useKarma {
-                        useChromeHeadless()
-                    }
-                }
-            }
-            compilations.configureEach {
-                kotlinOptions {
-                    moduleKind = "umd"
-                }
-            }
-        }
+// UninitializedPropertyAccessException: lateinit property newsResourceDao has not been initialized
+//        js {
+//            browser {
+//                testTask {
+//                    useKarma {
+//                        useChromeHeadless()
+//                    }
+//                }
+//            }
+//            compilations.configureEach {
+//                kotlinOptions {
+//                    moduleKind = "umd"
+//                }
+//            }
+//        }
 
         // tier 1
         linuxX64()
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index c231016a5..e10ac7c30 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -70,3 +70,14 @@ sqldelight {
         }
     }
 }
+
+// Workaround yarn concurrency issue - https://youtrack.jetbrains.com/issue/KT-43320
+tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>()
+    .configureEach {
+        args.addAll(
+            listOf(
+                "--mutex",
+                "file:${file("../build/.yarn-mutex")}",
+            ),
+        )
+    }