diff --git a/src/xdgurl.py b/src/xdgurl.py
index d40b1a119a48d96459b7c80247d52b37cf589f20..c9d89f2190a2d6b7c8615ceac13dc5999f563e91 100644
--- a/src/xdgurl.py
+++ b/src/xdgurl.py
@@ -146,10 +146,10 @@ class XdgUrl:
             meta['type'] = urllib.unquote(query['type'][0])
 
         if 'filename' in query and query['filename'][0]:
-            meta['filename'] = urllib.unquote(query['filename'][0])
+            meta['filename'] = urllib.unquote(query['filename'][0]).split('?')[0]
 
         if meta['url'] and not meta['filename']:
-            meta['filename'] = os.path.basename(meta['url'])
+            meta['filename'] = os.path.basename(meta['url']).split('?')[0]
 
         return meta