diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/ExposureResultStore.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/ExposureResultStore.kt
index 3c2c55c8c63c3ecaf9bcefd8459e601cd0c52985..27cefe75ba7f36a739c9a87dbf137f49391b36bb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/ExposureResultStore.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/ExposureResultStore.kt
@@ -11,12 +11,16 @@ class ExposureResultStore @Inject constructor() {
     private val internalResult = MutableStateFlow<AggregatedRiskResult?>(null)
     val result: Flow<AggregatedRiskResult?> = internalResult
 
+    private val internalWindows = MutableStateFlow<List<ExposureWindow>>(emptyList())
+    val windows: Flow<List<ExposureWindow>> = internalWindows
+
     private var entities: Pair<List<ExposureWindow>, AggregatedRiskResult?> = Pair(emptyList(), null)
 
     var exposureWindowEntities: Pair<List<ExposureWindow>, AggregatedRiskResult?>
         get() = entities
         set(value) {
             entities = value
+            internalWindows.value = value.first
             internalResult.value = value.second
         }
 }