diff --git a/lib/NotificationGenerator.php b/lib/NotificationGenerator.php
index 1dd6f2e80..d62fe150f 100644
--- a/lib/NotificationGenerator.php
+++ b/lib/NotificationGenerator.php
@@ -49,10 +49,7 @@ public function sendNotificationForEvent(IEvent $event, int $activityId) {
 		$selfAction = $event->getAffectedUser() === $event->getAuthor();
 		$notifySetting = $this->userSettings->getUserSetting($event->getAffectedUser(), 'notify', $event->getType());
 
-		// User is not the author or wants to see their own actions
-		$createStream = !$selfAction || $this->userSettings->getUserSetting($event->getAffectedUser(), 'setting', 'self');
-
-		if (($notifySetting || true) && $event->getGenerateNotification()) {
+		if ($notifySetting && !$selfAction && $event->getGenerateNotification()) {
 			$this->notificationManager->notify($this->getNotificationForEvent($event, $activityId));
 		}
 	}