diff --git a/backend/btrixcloud/colls.py b/backend/btrixcloud/colls.py
index 39f8cf6f..8a5927da 100644
--- a/backend/btrixcloud/colls.py
+++ b/backend/btrixcloud/colls.py
@@ -156,6 +156,9 @@ class CollectionOps:
             query["isPublic"] = True
 
         result = await self.collections.find_one(query)
+        if not result:
+            return None
+
         if resources:
             result["resources"] = await self.get_collection_crawl_resources(
                 coll_id, org
diff --git a/backend/test/test_collections.py b/backend/test/test_collections.py
index 2dcb74f6..460414b4 100644
--- a/backend/test/test_collections.py
+++ b/backend/test/test_collections.py
@@ -249,9 +249,7 @@ def test_get_collection(crawler_auth_headers, default_org_id):
     assert data["tags"] == ["wr-test-2", "wr-test-1"]
 
 
-def test_get_collection_replay(
-    crawler_auth_headers, default_org_id, crawler_crawl_id, admin_crawl_id
-):
+def test_get_collection_replay(crawler_auth_headers, default_org_id):
     r = requests.get(
         f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}/replay.json",
         headers=crawler_auth_headers,
@@ -276,6 +274,48 @@ def test_get_collection_replay(
         assert resource["size"]
 
 
+def test_collection_public(crawler_auth_headers, default_org_id):
+    r = requests.get(
+        f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}/public/replay.json",
+        headers=crawler_auth_headers,
+    )
+    assert r.status_code == 404
+
+    # make public
+    r = requests.patch(
+        f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}",
+        headers=crawler_auth_headers,
+        json={
+            "isPublic": True,
+        },
+    )
+    assert r.status_code == 200
+    assert r.json()["updated"]
+
+    r = requests.get(
+        f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}/public/replay.json",
+        headers=crawler_auth_headers,
+    )
+    assert r.status_code == 200
+    assert r.headers["Access-Control-Allow-Origin"] == "*"
+    assert r.headers["Access-Control-Allow-Headers"] == "*"
+
+    # make private again
+    r = requests.patch(
+        f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}",
+        headers=crawler_auth_headers,
+        json={
+            "isPublic": False,
+        },
+    )
+
+    r = requests.get(
+        f"{API_PREFIX}/orgs/{default_org_id}/collections/{_coll_id}/public/replay.json",
+        headers=crawler_auth_headers,
+    )
+    assert r.status_code == 404
+
+
 def test_add_upload_to_collection(crawler_auth_headers, default_org_id):
     with open(os.path.join(curr_dir, "data", "example.wacz"), "rb") as fh:
         r = requests.put(