diff --git a/server/.golangci.yml b/server/.golangci.yml
index a8eb3b91d6..1a0483077b 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -109,7 +109,6 @@ issues:
         channels/app/job_test.go|\
         channels/app/login_test.go|\
         channels/app/migrations.go|\
-        channels/app/notification_push.go|\
         channels/app/notification_test.go|\
         channels/app/onboarding_test.go|\
         channels/app/permissions.go|\
diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go
index 56e5511764..c15c45a0db 100644
--- a/server/channels/app/notification_push.go
+++ b/server/channels/app/notification_push.go
@@ -530,9 +530,12 @@ func (a *App) sendToPushProxy(msg *model.PushNotification, session *model.Sessio
 
 	switch pushResponse[model.PushStatus] {
 	case model.PushStatusRemove:
-		a.SetExtraSessionProps(session, map[string]string{
+		appErr := a.SetExtraSessionProps(session, map[string]string{
 			model.SessionPropLastRemovedDeviceId: session.DeviceId,
 		})
+		if appErr != nil {
+			return fmt.Errorf("Failed to set extra session properties: %w", appErr)
+		}
 		a.ClearSessionCacheForUser(session.UserId)
 		return errors.New(notificationErrorRemoveDevice)
 	case model.PushStatusFail: