diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
index 61ee8c0258a9f2afbb5f3b9641a37d31c0520ba1..8acd0b0157f0a9c06c863351c408acd3f0af6dc2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
@@ -117,7 +117,14 @@ public class DataSet<T extends DataSetInformation> extends AbstractDataSetImmuta
     @Override
     public IExperimentImmutable getExperiment()
     {
+        if (experiment != null)
+        {
         return experiment;
+        } else if (sampleOrNull != null)
+        {
+            return sampleOrNull.getExperiment();
+        }
+        return null;
     }
 
     @Override