diff --git a/sgx-bwmsgsv2.rb b/sgx-bwmsgsv2.rb
index a1e1b00fea8b0dd19dc6f6ac1f47a14248f3ad4f..1b6ecb510a28daf16992d69ccf9b7d37cd8878c9 100755
--- a/sgx-bwmsgsv2.rb
+++ b/sgx-bwmsgsv2.rb
@@ -847,19 +847,6 @@ class WebhookHandler < Goliath::API
 				text = jparams['text']
 			when 'mms'
 				has_media = false
-				jparams['media'].each do |media_url|
-					if not media_url.end_with?(
-						'.smil', '.txt', '.xml'
-					)
-
-						has_media = true
-						SGXbwmsgsv2.send_media(
-							others_num + '@' +
-							ARGV[0],
-							bare_jid, media_url
-						)
-					end
-				end
 
 				if jparams['text'].empty?
 					if not has_media
@@ -920,6 +907,20 @@ class WebhookHandler < Goliath::API
 					# TODO: delete
 					puts "RESPONSE9: #{msg.inspect}"
 				end
+
+				jparams['media'].each do |media_url|
+					if not media_url.end_with?(
+						'.smil', '.txt', '.xml'
+					)
+
+						has_media = true
+						SGXbwmsgsv2.send_media(
+							others_num + '@' +
+							ARGV[0],
+							bare_jid, media_url
+						)
+					end
+				end
 			else
 				text = "unknown type (#{type})"\
 					" with text: " + jparams['text']