diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt
index d75e3d2c44f330665aa91f2b265c68c33d99a3b7..c5e4b8073deb172dcb4856afb9d2406af38ef94d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTracker.kt
@@ -10,6 +10,7 @@ import de.rki.coronawarnapp.util.mutate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -48,7 +49,7 @@ class DefaultExposureDetectionTracker @Inject constructor(
                     hd.updateSafely {
                         val timeNow = timeStamper.nowUTC
                         Timber.v("Running timeout check (now=%s): %s", timeNow, values)
-                        val timeoutLimit = appConfigProvider.getAppConfig().overallDetectionTimeout
+                        val timeoutLimit = appConfigProvider.currentConfig.first().overallDetectionTimeout
                         mutate {
                             values.filter { it.isCalculating }.toList().forEach {
                                 if (timeNow.isAfter(it.startedAt.plus(timeoutLimit))) {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTrackerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTrackerTest.kt
index f40ea545e66e9cf770273c5da907f2ae26f7632d..0521bdb63cc6523f953df8dd9cf190428c27f25b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTrackerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/detectiontracker/DefaultExposureDetectionTrackerTest.kt
@@ -18,6 +18,7 @@ import io.mockk.just
 import io.mockk.verify
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runBlockingTest
 import org.joda.time.Duration
 import org.joda.time.Instant
@@ -44,7 +45,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() {
         coEvery { storage.load() } returns emptyMap()
         coEvery { storage.save(any()) } just Runs
 
-        coEvery { configProvider.getAppConfig() } returns appConfigData
+        coEvery { configProvider.currentConfig } returns flowOf(appConfigData)
         every { appConfigData.overallDetectionTimeout } returns Duration.standardMinutes(15)
     }
 
@@ -107,7 +108,7 @@ class DefaultExposureDetectionTrackerTest : BaseTest() {
             advanceUntilIdle()
         }
 
-        coVerify { configProvider.getAppConfig() }
+        coVerify { configProvider.currentConfig }
     }
 
     @Test