diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
index 67aa3b39cd..22607a39c6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
@@ -43,8 +43,8 @@ fun elementColorsDark() = ElementColors(
 val materialColorSchemeDark = darkColorScheme(
     primary = Color.White,
     onPrimary = Color.Black,
-    primaryContainer = Color.Black,
-    onPrimaryContainer = Color.White,
+    // TODO primaryContainer = ColorDarkTokens.PrimaryContainer,
+    // TODO onPrimaryContainer = ColorDarkTokens.OnPrimaryContainer,
     // TODO inversePrimary = ColorDarkTokens.InversePrimary,
     secondary = DarkGrey,
     // TODO onSecondary = ColorDarkTokens.OnSecondary,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
index 99a24c2871..96f0db2c78 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
@@ -44,8 +44,8 @@ fun elementColorsLight() = ElementColors(
 val materialColorSchemeLight = lightColorScheme(
     primary = Black_900,
     onPrimary = Color.White,
-    primaryContainer = Color.White,
-    onPrimaryContainer = Color.Black,
+    // TODO primaryContainer = ColorLightTokens.PrimaryContainer,
+    // TODO onPrimaryContainer = ColorLightTokens.OnPrimaryContainer,
     // TODO inversePrimary = ColorLightTokens.InversePrimary,
     secondary = Gray_200,
     // TODO onSecondary = ColorLightTokens.OnSecondary,