diff --git a/xmpp_tg/mtproto.py b/xmpp_tg/mtproto.py
index 16e2ffe..0af54b8 100644
--- a/xmpp_tg/mtproto.py
+++ b/xmpp_tg/mtproto.py
@@ -153,7 +153,8 @@ class TelegramGateClient(TelegramClient):
                     # message media #
                 if update_obj.message.media:
                     text, oob_url = self._process_media_msg(update_obj.message.media)
-                    self.xmpp_send_message(prefix + str(cid), mbody =oob_url, oob_url=oob_url)
+                    if oob_url is not None;
+                        self.xmpp_send_message(prefix + str(cid), mbody =oob_url, oob_url=oob_url) # send image/media in separate message
                     msg = '{} {}'.format(msg, text)
 
                 # edited #
@@ -329,7 +330,6 @@ class TelegramGateClient(TelegramClient):
                 msg = '[{}{}{}] {}{}'.format(video_type, video_file, size_text, caption, g_link['link'])
         elif type(media) is MessageMediaPhoto:  # photo (jpg)
             g_link = self.generate_media_link(media)
-            msg = g_link['link']
             url = g_link['link']
 
             self._media_queue.put({'media': media, 'file': g_link['name']})