diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerController.js
index 12f547c8c446352ae4a69cfbe7d3acc0fa0fd8ce..190ad1ead4863964730b9295943185cc52c140cc 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerController.js
@@ -44,14 +44,32 @@ function DataSetViewerController(containerId, profile, entity, serverFacade, dat
 			if (this._datasetViewerModel.isExperiment()) {
 				serverFacade.listExperimentsForIdentifiers([this._datasetViewerModel.entity.identifier.identifier], function(data) {
 					serverFacade.listDataSetsForExperiment(data.result[0], function(datasets) {
-						_this.updateDatasets(datasets.result);
-						_this._datasetViewerView.repaintDatasets();
+						var results;
+						if(_this._datasetViewerModel.isExperiment()) { //Filter out datasets own by samples
+							results = [];
+							for(var dIdx = 0; dIdx < datasets.result.length; dIdx++) {
+								var dataset = datasets.result[dIdx];
+								if(!dataset.sampleIdentifierOrNull) {
+									results.push(dataset);
+								}
+							}
+						} else {
+							results = datasets.result;
+						}
+						
+						if(results.length > 0) {
+							_this.updateDatasets(results);
+							_this._datasetViewerView.repaintDatasets();
+						}
+						
 					});
 				});
 			} else {
 				serverFacade.listDataSetsForSample(this._datasetViewerModel.entity, true, function(datasets) {
-					_this.updateDatasets(datasets.result);
-					_this._datasetViewerView.repaintDatasets();
+					if(datasets.result.length > 0) {
+						_this.updateDatasets(datasets.result);
+						_this._datasetViewerView.repaintDatasets();
+					}
 				});
 			}
 		}