diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py
index 7dbd435d..f3269348 100644
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -141,7 +141,7 @@ class bufferController(object):
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1)
-   if not hasattr(tweet, "attachments"):
+   if not hasattr(tweet, "attachments") or len(tweet.attachments) == 0:
     call_threaded(self.session.api_call, call_name="update_status", status=text)
    else:
     call_threaded(self.post_with_media, text=text, attachments=tweet.attachments)