diff --git a/internal/executor/create.go b/internal/executor/create.go
index 96f3c73..ec3dabf 100644
--- a/internal/executor/create.go
+++ b/internal/executor/create.go
@@ -151,7 +151,9 @@ func (c *CreateExecutor) createStatus(gtsClient *client.Client) error {
 		}
 	}
 
-	if c.addPoll && !c.attachmentIDs.Empty() {
+	numAttachmentIDs := len(attachmentIDs)
+
+	if c.addPoll && numAttachmentIDs > 0 {
 		return fmt.Errorf("attaching media to a poll is not allowed")
 	}
 
@@ -204,8 +206,8 @@ func (c *CreateExecutor) createStatus(gtsClient *client.Client) error {
 		AttachmentIDs: nil,
 	}
 
-	if !c.attachmentIDs.Empty() {
-		form.AttachmentIDs = c.attachmentIDs
+	if numAttachmentIDs > 0 {
+		form.AttachmentIDs = attachmentIDs
 	}
 
 	if c.addPoll {