diff --git a/http/httpserver.cpp b/http/httpserver.cpp
index bcfe76da4..d1e5b2a36 100644
--- a/http/httpserver.cpp
+++ b/http/httpserver.cpp
@@ -187,7 +187,11 @@ Song HttpServer::decodeUrl(const QString &url) const
         if (u.hasQueryItem("track")) {
             s.track=u.queryItemValue("track").toInt();
         }
-        s.file=url;
+        if (u.hasQueryItem("file")) {
+            s.file=u.queryItemValue("file");
+        } else {
+            s.file=u.path();
+        }
     }
 
     return s;