diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index ba5c63bb2d1251c7d8c28054dd7a6c6ebda9397a..efd396afde8828a487c67b244deb8078e9161e7a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -697,8 +697,15 @@ class AuthenticatedState extends AbstractDssComponentState
 
         try
         {
-            return dataSetDss.getService().tryGetPathToDataSet(getSessionToken(),
-                    dataSetDss.getCode(), overrideStoreRootPathOrNull);
+            if (minorVersion < 8)
+            {
+                return dataSetDss.getService().getPathToDataSet(getSessionToken(),
+                        dataSetDss.getCode(), overrideStoreRootPathOrNull);
+            } else
+            {
+                return dataSetDss.getService().tryGetPathToDataSet(getSessionToken(),
+                        dataSetDss.getCode(), overrideStoreRootPathOrNull);
+            }
         } catch (IllegalArgumentException e)
         {
             // We could not create a link, return null