diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
index 9af108afeaf5050149af78eed0d289005709cea8..06648265c95838ea0cafb2b40594bbfe850cd725 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/CoronaTestRepository.kt
@@ -121,7 +121,7 @@ class CoronaTestRepository @Inject constructor(
 
         val toRefresh = internalData.data
             .first().values
-            .filter { if (type == null) true else it.type == type }
+            .filter { type == null || it.type == type }
             .map { it.identifier }
 
         Timber.tag(TAG).d("Will refresh %s", toRefresh)
@@ -134,7 +134,7 @@ class CoronaTestRepository @Inject constructor(
 
         val refreshedData = internalData.updateBlocking {
             val polling = values
-                .filter { if (type == null) true else it.type == type }
+                .filter { type == null || it.type == type }
                 .filter { toRefresh.contains(it.identifier) }
                 .map { coronaTest ->