diff --git a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/TimeZoneMonitor.kt b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/TimeZoneMonitor.kt
index 6e206e67c..031bc9388 100644
--- a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/TimeZoneMonitor.kt
+++ b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/util/TimeZoneMonitor.kt
@@ -39,6 +39,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toKotlinTimeZone
 import java.time.ZoneId
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -75,7 +76,8 @@ internal class TimeZoneBroadcastMonitor @Inject constructor(
                         intent.getStringExtra(Intent.EXTRA_TIMEZONE)?.let { timeZoneId ->
                             // We need to convert it from java.util.Timezone to java.time.ZoneId
                             val zoneId = ZoneId.of(timeZoneId, ZoneId.SHORT_IDS)
-                            TimeZone.of(zoneId.id)
+                            // Convert to kotlinx.datetime.TimeZone
+                            zoneId.toKotlinTimeZone()
                         }
                     }