diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 5f65fc8a7d6..f5571bbdccf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -15,7 +15,6 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryWorkScheduler
-import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
 import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.ui.base.startActivitySafely
@@ -201,10 +200,6 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
         onBackPressed()
     }
 
-    fun navigateToContactDiaryActivity() {
-        ContactDiaryActivity.start(this)
-    }
-
     /**
      * Scheduling for a download of keys every hour.
      */
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
index 731d5515c9e..0024087d326 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
@@ -6,8 +6,8 @@ import android.view.View
 import android.view.accessibility.AccessibilityEvent
 import androidx.fragment.app.Fragment
 import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
 import de.rki.coronawarnapp.databinding.FragmentHomeBinding
-import de.rki.coronawarnapp.ui.main.MainActivity
 import de.rki.coronawarnapp.util.DeviceUIState
 import de.rki.coronawarnapp.util.DialogHelper
 import de.rki.coronawarnapp.util.ExternalActionHelper
@@ -69,15 +69,15 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
             contentDescription = getString(R.string.hint_external_webpage)
         }
 
-        vm.popupEvents.observe2(this) {
-            when (it) {
+        vm.popupEvents.observe2(this) { event ->
+            when (event) {
                 HomeFragmentEvents.ShowInteropDeltaOnboarding -> {
                     doNavigate(
                         HomeFragmentDirections.actionMainFragmentToOnboardingDeltaInteroperabilityFragment()
                     )
                 }
                 is HomeFragmentEvents.ShowTracingExplanation -> {
-                    tracingExplanationDialog.show(it.activeTracingDaysInRetentionPeriod) {
+                    tracingExplanationDialog.show(event.activeTracingDaysInRetentionPeriod) {
                         vm.tracingExplanationWasShown()
                     }
                 }
@@ -91,7 +91,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
                     showRemoveTestDialog()
                 }
                 HomeFragmentEvents.GoToContactDiary -> {
-                    (requireActivity() as MainActivity).navigateToContactDiaryActivity()
+                    context?.let { ContactDiaryActivity.start(it) }
                 }
             }
         }