diff --git a/message.go b/message.go
index 629bdbd..0d489c3 100644
--- a/message.go
+++ b/message.go
@@ -138,9 +138,9 @@ func (c *Client) LabelMessages(ctx context.Context, messageIDs []string, labelID
 		}
 
 		if ok, errStr := res.ok(); !ok {
-			tokens := xslices.Map(results, func(res LabelMessagesRes) UndoToken {
+			tokens := append(xslices.Map(results, func(res LabelMessagesRes) UndoToken {
 				return res.UndoToken
-			})
+			}), res.UndoToken)
 
 			if _, undoErr := c.UndoActions(ctx, tokens...); undoErr != nil {
 				return fmt.Errorf("failed to undo label actions (undo reason: %v): %w", errStr, undoErr)
@@ -171,9 +171,9 @@ func (c *Client) UnlabelMessages(ctx context.Context, messageIDs []string, label
 		}
 
 		if ok, errStr := res.ok(); !ok {
-			tokens := xslices.Map(results, func(res LabelMessagesRes) UndoToken {
+			tokens := append(xslices.Map(results, func(res LabelMessagesRes) UndoToken {
 				return res.UndoToken
-			})
+			}), res.UndoToken)
 
 			if _, undoErr := c.UndoActions(ctx, tokens...); undoErr != nil {
 				return fmt.Errorf("failed to undo unlabel actions (undo reason: %v): %w", errStr, undoErr)