diff --git a/commands/general/tweet.js b/commands/general/tweet.js
index b3baf8b1..54160a78 100644
--- a/commands/general/tweet.js
+++ b/commands/general/tweet.js
@@ -122,11 +122,15 @@ class tweetCommand extends Command {
 				status: text
 			};
 
-			if (data) {
+			if (data && args.text) {
 				options = {
 					status: text,
 					media_ids: new Array(data.media_id_string)
 				};
+			} else if (data) {
+				options = {
+					media_ids: new Array(data.media_id_string)
+				};
 			}
 
 			T.post('statuses/update', options, function (err, response) {