diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index 4b84b22d41f222c24335eff7b562467d131e7a5e..9e5d5f0926e77a874b98c7a552662a0d027689e3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -64,15 +64,15 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
     static final String MAIN_DATA_SET_PATTERN_KEY = "mdsPattern";
 
     private static String DOWNLOAD_URL;
-    
+
     static void setDownloadUrl(String downloadUrl)
     {
         if (downloadUrl.endsWith("/"))
         {
-            DOWNLOAD_URL = downloadUrl;
+            DOWNLOAD_URL = downloadUrl.substring(0, downloadUrl.length() - 1);
         } else
         {
-            DOWNLOAD_URL = downloadUrl + "/";
+            DOWNLOAD_URL = downloadUrl;
         }
     }