diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp
index 8a742bc54..fbcc98b9c 100644
--- a/src/subsonic/subsonicbaserequest.cpp
+++ b/src/subsonic/subsonicbaserequest.cpp
@@ -73,7 +73,13 @@ QUrl SubsonicBaseRequest::CreateUrl(const QString &ressource_name, const QList<P
   }
 
   QUrl url(server_url());
-  url.setPath(QString("/rest/") + ressource_name);
+
+  if (url.path().right(1) == '/') {
+    url.setPath(url.path() + QString("rest/") + ressource_name);
+  }
+  else
+    url.setPath(url.path() + QString("/rest/") + ressource_name);
+
   url.setQuery(url_query);
 
   return url;
diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp
index 02ffb6f67..1fe20c5ea 100644
--- a/src/subsonic/subsonicservice.cpp
+++ b/src/subsonic/subsonicservice.cpp
@@ -140,7 +140,12 @@ void SubsonicService::SendPing(QUrl url, const QString &username, const QString
     url_query.addQueryItem(encoded_param.first, encoded_param.second);
   }
 
-  url.setPath("/rest/ping.view");
+  if (url.path().right(1) == '/') {
+    url.setPath(url.path() + QString("rest/ping.view"));
+  }
+  else
+    url.setPath(url.path() + QString("/rest/ping.view"));
+
   url.setQuery(url_query);
 
   QNetworkRequest req(url);
diff --git a/src/subsonic/subsonicurlhandler.cpp b/src/subsonic/subsonicurlhandler.cpp
index 8de9892f0..7e628dc7e 100644
--- a/src/subsonic/subsonicurlhandler.cpp
+++ b/src/subsonic/subsonicurlhandler.cpp
@@ -45,7 +45,13 @@ UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl &url) {
   }
 
   QUrl media_url(server_url());
-  media_url.setPath("/rest/stream");
+
+  if (media_url.path().right(1) == '/') {
+    media_url.setPath(media_url.path() + QString("rest/stream"));
+  }
+  else
+    media_url.setPath(media_url.path() + QString("/rest/stream"));
+
   media_url.setQuery(url_query);
 
   return LoadResult(url, LoadResult::TrackAvailable, media_url);