diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
index 561cf45bf9a93b449f9876f9bee09a02abda8bdc..3bf210bdb0362ff681fc77ad2a50001953509de3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanFragment.kt
@@ -102,17 +102,7 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co
                 ApiRequestState.STARTED -> View.VISIBLE
                 else -> View.GONE
             }
-
-            if (ApiRequestState.SUCCESS == state.apiRequestState) {
-                return@observe2
-            }
-
-            if (state.test == null) {
-                Timber.w("Successful API request, but test was null?")
-                return@observe2
-            }
-
-            when (state.test.testResult) {
+            when (state.test?.testResult) {
                 CoronaTestResult.PCR_POSITIVE ->
                     NavGraphDirections.actionToSubmissionTestResultAvailableFragment(testType = Type.PCR)
 
@@ -132,6 +122,10 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co
                 CoronaTestResult.RAT_PENDING,
                 CoronaTestResult.RAT_REDEEMED ->
                     NavGraphDirections.actionSubmissionTestResultPendingFragment(testType = Type.RAPID_ANTIGEN)
+                null -> {
+                    Timber.w("Successful API request, but test was null?")
+                    return@observe2
+                }
             }.run { doNavigate(this) }
         }