diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
index 709851dc71f520e468b27b8f4882a29899eae992..60a7816a55c5db850fe2426482ea28d5927a9307 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingFragment.kt
@@ -61,6 +61,10 @@ class SubmissionTestResultPendingFragment : Fragment(R.layout.fragment_submissio
             }
         }
 
+        viewModel.testCertResultInfo.observe2(this) { result ->
+            binding.testResultPendingStepsCertificateInfo.setEntryText(result.get(requireContext()))
+        }
+
         binding.apply {
             val isPcr = navArgs.testType == CoronaTest.Type.PCR
             testResultPendingStepsWaitingAntigenResult.isVisible = !isPcr
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
index ada54dddd635a7c436a98d3a6788c3adc792f0f3..0a7ea7fe96df788be96c9b00af8de2dc9ff166ac 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
@@ -101,12 +101,16 @@ class SubmissionTestResultPendingViewModel @AssistedInject constructor(
 
     val testCertResultInfo: LiveData<LazyString> = testResultFlow
         .map {
-            when (it.coronaTest.type) {
-                CoronaTest.Type.RAPID_ANTIGEN ->
+            when {
+                !it.coronaTest.isDccSupportedByPoc -> {
                     R.string.submission_test_result_pending_steps_test_certificate_not_supported_body
-                CoronaTest.Type.PCR -> when (it.coronaTest.isAdvancedConsentGiven) {
-                    true -> R.string.submission_test_result_pending_steps_test_certificate_not_available_yet_body
-                    false -> R.string.submission_test_result_pending_steps_test_certificate_not_desired_by_user_body
+                }
+                else -> {
+                    if (it.coronaTest.isAdvancedConsentGiven) {
+                        R.string.submission_test_result_pending_steps_test_certificate_not_available_yet_body
+                    } else {
+                        R.string.submission_test_result_pending_steps_test_certificate_not_desired_by_user_body
+                    }
                 }
             }.toResolvingString()
         }