diff --git a/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt b/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
index 72692a9f5..d573788a6 100644
--- a/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
+++ b/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
@@ -12,6 +12,7 @@ import org.schabi.newpipe.database.feed.model.FeedEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.StreamWithState
 import org.schabi.newpipe.database.stream.model.StreamStateEntity
+import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
 import java.time.OffsetDateTime
 
@@ -252,4 +253,21 @@ abstract class FeedDAO {
         """
     )
     abstract fun getAllOutdatedForGroup(groupId: Long, outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
+
+    @Query(
+        """
+        SELECT s.* FROM subscriptions s
+
+        LEFT JOIN feed_last_updated lu
+        ON s.uid = lu.subscription_id
+
+        WHERE 
+            (lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold)
+            AND s.notification_mode = :notificationMode
+        """
+    )
+    abstract fun getOutdatedWithNotificationMode(
+        outdatedThreshold: OffsetDateTime,
+        @NotificationMode notificationMode: Int
+    ): Flowable<List<SubscriptionEntity>>
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt
index 2acf002c0..7a8723ceb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt
@@ -14,6 +14,7 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.StreamWithState
 import org.schabi.newpipe.database.stream.model.StreamEntity
+import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.extractor.stream.StreamType
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
@@ -57,6 +58,11 @@ class FeedDatabaseManager(context: Context) {
 
     fun outdatedSubscriptions(outdatedThreshold: OffsetDateTime) = feedTable.getAllOutdated(outdatedThreshold)
 
+    fun outdatedSubscriptionsWithNotificationMode(
+        outdatedThreshold: OffsetDateTime,
+        @NotificationMode notificationMode: Int
+    ) = feedTable.getOutdatedWithNotificationMode(outdatedThreshold, notificationMode)
+
     fun notLoadedCount(groupId: Long = FeedGroupEntity.GROUP_ALL_ID): Flowable<Long> {
         return when (groupId) {
             FeedGroupEntity.GROUP_ALL_ID -> feedTable.notLoadedCount()
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
index 6886c1e03..1c75442a1 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
@@ -16,7 +16,6 @@ import androidx.work.rxjava3.RxWorker
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import org.schabi.newpipe.R
-import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.local.feed.service.FeedLoadManager
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import java.util.concurrent.TimeUnit
@@ -36,12 +35,14 @@ class NotificationWorker(
     private val feedLoadManager = FeedLoadManager(appContext)
 
     override fun createWork(): Single<Result> = if (isEnabled(applicationContext)) {
-        feedLoadManager.startLoading(ignoreOutdatedThreshold = true)
+        feedLoadManager.startLoading(
+            ignoreOutdatedThreshold = true,
+            groupId = FeedLoadManager.GROUP_NOTIFICATION_ENABLED
+        )
             .map { feed ->
                 feed.mapNotNull { x ->
                     x.value?.takeIf {
-                        it.notificationMode == NotificationMode.ENABLED &&
-                            it.newStreamsCount > 0
+                        it.newStreamsCount > 0
                     }
                 }
             }
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
index 528bcc5d2..fb9f73ff5 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt
@@ -12,6 +12,7 @@ import io.reactivex.rxjava3.processors.PublishProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
+import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.extractor.ListInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.local.feed.FeedDatabaseManager
@@ -41,6 +42,8 @@ class FeedLoadManager(private val context: Context) {
      * Start checking for new streams of a subscription group.
      * @param groupId The ID of the subscription group to load.
      * When using [FeedGroupEntity.GROUP_ALL_ID], all subscriptions are loaded.
+     * When using [GROUP_NOTIFICATION_ENABLED], only subscriptions with enabled notifications
+     * for new streams are loaded.
      * @param ignoreOutdatedThreshold When `false`, only subscriptions which have not been updated
      * within the `feed_update_threshold` are checked for updates.
      * This threshold can be set by the user in the app settings.
@@ -73,6 +76,9 @@ class FeedLoadManager(private val context: Context) {
          */
         val outdatedSubscriptions = when (groupId) {
             FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(outdatedThreshold)
+            GROUP_NOTIFICATION_ENABLED -> feedDatabaseManager.outdatedSubscriptionsWithNotificationMode(
+                outdatedThreshold, NotificationMode.ENABLED
+            )
             else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold)
         }
 
@@ -248,16 +254,21 @@ class FeedLoadManager(private val context: Context) {
         }
     }
 
-    private companion object {
+    companion object {
+
+        /**
+         *
+         */
+        const val GROUP_NOTIFICATION_ENABLED = -2L
 
         /**
          * How many extractions will be running in parallel.
          */
-        const val PARALLEL_EXTRACTIONS = 6
+        private const val PARALLEL_EXTRACTIONS = 6
 
         /**
          * Number of items to buffer to mass-insert in the database.
          */
-        const val BUFFER_COUNT_BEFORE_INSERT = 20
+        private const val BUFFER_COUNT_BEFORE_INSERT = 20
     }
 }