diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 7dd29acd0132..922bf8adbabf 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -644,7 +644,7 @@ def stderr(self, stderr):
 LEFT OUTER JOIN library_dataset_dataset_association ON dataset.id = library_dataset_dataset_association.dataset_id
 WHERE dataset.id IN (SELECT dataset_id FROM per_hist_hdas)
     AND library_dataset_dataset_association.id IS NULL
-    AND dataset.object_store_id NOT LIKE 'user_objects://%'
+    AND (dataset.object_store_id NOT LIKE 'user_objects://%' OR dataset.object_store_id IS NULL)
     {and_dataset_condition}
 """