diff --git a/src/murfey/client/contexts/spa_metadata.py b/src/murfey/client/contexts/spa_metadata.py
index 747cc4ec9..1f617a9eb 100644
--- a/src/murfey/client/contexts/spa_metadata.py
+++ b/src/murfey/client/contexts/spa_metadata.py
@@ -164,9 +164,9 @@ def post_transfer(
                 f"Collecting foil hole positions for {str(transferred_file)} and grid square {gs_name}"
             )
             fh_positions = _foil_hole_positions(transferred_file, gs_name)
-            visitless_source_search_dir = str(source).replace(
-                f"/{environment.visit}", ""
-            )
+            visitless_source_search_dir = "/".join(
+                [part for part in source.parts if part != environment.visit]
+            ).replace("//", "/")
             visitless_source_images_dirs = sorted(
                 Path(visitless_source_search_dir).glob("Images-Disc*"),
                 key=lambda x: x.stat().st_ctime,