diff --git a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt b/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt
index d3c7f16b..b5c09091 100644
--- a/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt
+++ b/app/src/main/java/com/readrops/app/adapters/NotificationPermissionListAdapter.kt
@@ -29,11 +29,8 @@ class NotificationPermissionListAdapter(var enableAll: Boolean, val listener: (f
         holder.binding.notificationSwitch.isChecked = feed.isNotificationEnabled
 
         holder.binding.notificationSwitch.isEnabled = enableAll
-        holder.binding.notificationSwitch.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked != feed.isNotificationEnabled) listener(feed)
-        }
 
-        holder.itemView.setOnClickListener { if (enableAll) listener(feed) }
+        holder.itemView.setOnClickListener { if (enableAll) listener(getItem(position)) }
 
         GlideApp.with(holder.itemView.context)
                 .load(feed.iconUrl)
diff --git a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt b/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt
index 4d886dbe..88ed2612 100644
--- a/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt
+++ b/app/src/main/java/com/readrops/app/viewmodels/NotificationPermissionViewModel.kt
@@ -24,6 +24,6 @@ class NotificationPermissionViewModel(application: Application) : AndroidViewMod
     fun setFeedNotificationState(feed: Feed): Completable = database.feedDao()
             .updateFeedNotificationState(feed.id, !feed.isNotificationEnabled)
 
-    fun setAllFeedsNotificationState(enabled: Boolean) = database.feedDao()
+    fun setAllFeedsNotificationState(enabled: Boolean): Completable = database.feedDao()
             .updateAllFeedsNotificationState(account?.id!!, enabled)
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_layout.xml b/app/src/main/res/layout/notification_layout.xml
index abb961ab..9519d883 100644
--- a/app/src/main/res/layout/notification_layout.xml
+++ b/app/src/main/res/layout/notification_layout.xml
@@ -43,7 +43,8 @@
                 android:id="@+id/notification_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true" />
+                android:layout_alignParentEnd="true"
+                android:clickable="false" />
 
         </RelativeLayout>