diff --git a/app/Notifications/NewComment.php b/app/Notifications/NewComment.php
index 0d2c19e67..500e6f24c 100644
--- a/app/Notifications/NewComment.php
+++ b/app/Notifications/NewComment.php
@@ -87,9 +87,7 @@ class NewComment extends Notification
                 // the expression will return false.
                 return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
             case Ticket::class:
-                return ! ($this->model->staff_id === $this->comment->id && $this->model->staff_id !== null)
-                ;
-
+                return $notifiable->id !== $this->comment->user_id;
             case Playlist::class:
             case Article::class:
                 break;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f2f7929da..cb34fdf53 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -582,12 +582,6 @@ parameters:
 			count: 1
 			path: app/Models/User.php
 
-		-
-			message: '#^Strict comparison using \!\=\= between int and null will always evaluate to true\.$#'
-			identifier: notIdentical.alwaysTrue
-			count: 1
-			path: app/Notifications/NewComment.php
-
 		-
 			message: '#^Cannot access offset ''validator'' on Illuminate\\Contracts\\Foundation\\Application\.$#'
 			identifier: offsetAccess.nonOffsetAccessible