diff --git a/src/plugins/plugin_misc_upload.py b/src/plugins/plugin_misc_upload.py
index cc718ee1..c0be179e 100644
--- a/src/plugins/plugin_misc_upload.py
+++ b/src/plugins/plugin_misc_upload.py
@@ -67,7 +67,6 @@ class UploadPlugin(object):
 
         return self.fileUpload(client, filepath, filename or None, upload_jid, options or None)
 
-    @defer.inlineCallbacks
     def fileUpload(self, client, filepath, filename, upload_jid, options):
         """Send a file using best available method
 
@@ -83,7 +82,7 @@ class UploadPlugin(object):
             log.warning(msg)
             return {'xmlui': xml_tools.note(u"Can't upload file", msg, C.XMLUI_DATA_LVL_WARNING).toXml()}
 
-        d = self.upload(filepath, filename, upload_jid, options, client.profile)
+        d = self.upload(client, filepath, filename, upload_jid, options)
         d.addCallback(uploadCb)
         d.addErrback(uploadEb)
         return d