diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index 05f2cacae5145b0607f9b7bd44f35dd8d4433c54..82bf80fb30c71e03fadc2ae9af06fa33a37cd2af 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -54,6 +54,10 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer
                     + "    <argument>${session-id}</argument>\n" + "  </application-desc>\n"
                     + "</jnlp>");
 
+    // This must be the same value as what is assigned to the ${dss_upload_gui} variable in
+    // dss/build.xml .
+    private static final String UPLOAD_GUI_PATH = "dss_upload_gui";
+
     @Resource(name = ResourceNames.COMMON_SERVER)
     private ICommonServer server;
 
@@ -91,7 +95,9 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer
         {
             if (null == codebaseUrl)
             {
-                codebaseUrl = server.getDefaultPutDataStoreBaseURL(getSessionToken(request));
+                codebaseUrl =
+                        server.getDefaultPutDataStoreBaseURL(getSessionToken(request)) + "/"
+                                + UPLOAD_GUI_PATH;
             }
         }