diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index d88508203..f820db879 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -2306,12 +2306,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
             self.file_props.session_type = 'jingle'
             self.file_props.stream_methods = nbxmpp.NS_BYTESTREAM
             desc = self.jingle_content.getTag('description')
-            if desc.getTag('offer'):
-                file_tag = desc.getTag('offer').getTag('file')
+            if self.jingle_content.getAttr('creator') == 'initiator':
+                file_tag = desc.getTag('file')
                 self.file_props.sender = self.fjid
                 self.file_props.receiver = self.conn._ft_get_our_jid()
             else:
-                file_tag = desc.getTag('request').getTag('file')
+                file_tag = desc.getTag('file')
                 h = file_tag.getTag('hash')
                 h = h.getData() if h else None
                 n = file_tag.getTag('name')
diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py
index 1c457013c..0bba140ef 100644
--- a/src/common/jingle_content.py
+++ b/src/common/jingle_content.py
@@ -176,11 +176,7 @@ class JingleContent:
     def _fill_content(self, content):
         description_node = nbxmpp.simplexml.Node(
             tag=nbxmpp.NS_JINGLE_FILE_TRANSFER + ' description')
-        if self.session.werequest:
-            simode = nbxmpp.simplexml.Node(tag='request')
-        else:
-            simode = nbxmpp.simplexml.Node(tag='offer')
-        file_tag = simode.setTag('file')
+        file_tag = description_node.setTag('file')
         if self.file_props.name:
             node = nbxmpp.simplexml.Node(tag='name')
             node.addData(self.file_props.name)
@@ -217,7 +213,6 @@ class JingleContent:
         desc = file_tag.setTag('desc')
         if self.file_props.desc:
             desc.setData(self.file_props.desc)
-        description_node.addChild(node=simode)
         if self.use_security:
             security = nbxmpp.simplexml.Node(
                 tag=nbxmpp.NS_JINGLE_XTLS + ' security')