diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
index 77eeeabf7a0d68e7a90acbed457f671fbf94365a..570453ad9663339809c4b260a60b16ee09d06aa2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt
@@ -56,13 +56,9 @@ class SettingsNotificationFragment : Fragment() {
         // Notifications about risk status
         val updateRiskNotificationSwitch =
             binding.settingsSwitchRowNotificationsRisk.settingsSwitchRowSwitch
-        val updateRiskNotificationRow =
-            binding.settingsSwitchRowNotificationsRisk.settingsSwitchRow
         // Notifications about test status
         val updateTestNotificationSwitch =
             binding.settingsSwitchRowNotificationsTest.settingsSwitchRowSwitch
-        val updateTestNotificationRow =
-            binding.settingsSwitchRowNotificationsTest.settingsSwitchRow
         // Settings
         val settingsRow = binding.settingsNavigationRowSystem.navigationRow
         val goBack =
@@ -74,9 +70,6 @@ class SettingsNotificationFragment : Fragment() {
                 settingsViewModel.toggleNotificationsRiskEnabled()
             }
         }
-        updateRiskNotificationRow.setOnClickListener {
-            settingsViewModel.toggleNotificationsRiskEnabled()
-        }
         // Update Test
         updateTestNotificationSwitch.setOnCheckedChangeListener { _, _ ->
             // android calls this listener also on start, so it has to be verified if the user pressed the switch
@@ -84,9 +77,6 @@ class SettingsNotificationFragment : Fragment() {
                 settingsViewModel.toggleNotificationsTestEnabled()
             }
         }
-        updateTestNotificationRow.setOnClickListener {
-            settingsViewModel.toggleNotificationsTestEnabled()
-        }
         goBack.setOnClickListener {
             (activity as MainActivity).goBack()
         }
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
index 0f458929cec75cdfb256d39eab36b80d8625a2ff..f37e92a586d2745a047892182c53496c495f13da 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
@@ -54,6 +54,7 @@
                 app:showDivider="@{true}"
                 app:status="@{settingsViewModel.isNotificationsRiskEnabled()}"
                 app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsRiskEnabled())}"
+                app:enabled="@{true}"
                 app:subtitle="@{@string/settings_notifications_subtitle_update_risk}" />
 
             <include
@@ -67,7 +68,8 @@
                 app:layout_constraintTop_toBottomOf="@+id/settings_switch_row_notifications_risk"
                 app:showDivider="@{true}"
                 app:status="@{settingsViewModel.isNotificationsTestEnabled()}"
-                app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsRiskEnabled())}"
+                app:enabled="@{true}"
+                app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isNotificationsTestEnabled())}"
                 app:subtitle="@{@string/settings_notifications_subtitle_update_test}" />
 
             <include