diff --git a/internal/user/events.go b/internal/user/events.go
index c2ed3db1..4a56bcff 100644
--- a/internal/user/events.go
+++ b/internal/user/events.go
@@ -635,6 +635,10 @@ func (user *User) handleCreateMessageEvent(ctx context.Context, message proton.M
 			return nil, err
 		}
 
+		if update == nil {
+			return nil, nil
+		}
+
 		return []imap.Update{update}, nil
 	}, user.apiUserLock, user.apiAddrsLock, user.apiLabelsLock, user.updateChLock)
 }