diff --git a/pkg/models/listeners.go b/pkg/models/listeners.go
index f139f9c43..4c456f82e 100644
--- a/pkg/models/listeners.go
+++ b/pkg/models/listeners.go
@@ -586,15 +586,15 @@ func (l *UpdateTaskInSavedFilterViews) Handle(msg *message.Message) (err error)
 
 	var fallbackTimezone string
 	if event.Doer != nil {
-		var u *user.User
-		u, err = user.GetUserByID(s, event.Doer.GetID())
-		if err == nil {
+		u, userErr := user.GetUserByID(s, event.Doer.GetID())
+		if userErr == nil {
 			fallbackTimezone = u.Timezone
-			// When a link share triggered this event, the user id will be 0, and thus this fails.
-			// Only passing the value along when the user was retrieved successfully ensures the whole handler
-			// does not fail because of that.
-			// When the fallback is empty, it will be handled later anyhow.
 		}
+		// When a link share triggered this event, the user id will be 0, and thus this fails.
+		// Similarly, when the doer has been deleted, the user will not exist.
+		// Only passing the value along when the user was retrieved successfully ensures the whole handler
+		// does not fail because of that.
+		// When the fallback is empty, it will be handled later anyhow.
 	}
 
 	taskBuckets := []*TaskBucket{}