diff --git a/client/src/pages/contentBlockLocator.vue b/client/src/pages/contentBlockLocator.vue
index 769e6f9c..2df96079 100644
--- a/client/src/pages/contentBlockLocator.vue
+++ b/client/src/pages/contentBlockLocator.vue
@@ -35,10 +35,13 @@ const { onResult } = useQuery(query, () => ({ id: props.id }));
 
 onResult(({ data }) => {
   let path;
-  try {
+  if (data.chapter) {
     path = data.chapter.path;
-  } catch (e) {
+  } else if (data.contentBlock) {
     path = data.contentBlock.path;
+  } else {
+    router.push({ name: 'not-found' });
+    return;
   }
   router.push(`/${path}`);
 });