diff --git a/lib/galaxy/objectstore/__init__.py b/lib/galaxy/objectstore/__init__.py
index 3c6589499fce..3b7ba837d927 100644
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -629,7 +629,7 @@ def _construct_path(
             hash id (e.g., /files/dataset_10.dat (old) vs.
             /files/000/dataset_10.dat (new))
         """
-        base = os.path.abspath(self.extra_dirs.get(base_dir, self.file_path))
+        base = os.path.abspath(self.extra_dirs.get(base_dir) or self.file_path)
         # extra_dir should never be constructed from provided data but just
         # make sure there are no shenannigans afoot
         if extra_dir and extra_dir != os.path.normpath(extra_dir):
diff --git a/lib/galaxy_test/api/test_datasets.py b/lib/galaxy_test/api/test_datasets.py
index 2597c3fee8b1..be1b3a24bcd9 100644
--- a/lib/galaxy_test/api/test_datasets.py
+++ b/lib/galaxy_test/api/test_datasets.py
@@ -332,7 +332,7 @@ def test_delete_batch(self):
         dataset_map: Dict[int, str] = {}
         history_id = self.dataset_populator.new_history()
         for index in range(num_datasets):
-            hda = self.dataset_populator.new_dataset(history_id)
+            hda = self.dataset_populator.new_dataset(history_id, wait=True)
             dataset_map[index] = hda["id"]
 
         expected_deleted_source_ids = [