diff --git a/public/javascripts/burialSite.search.js b/public/javascripts/burialSite.search.js
index eca84aed..8fd0a58d 100644
--- a/public/javascripts/burialSite.search.js
+++ b/public/javascripts/burialSite.search.js
@@ -23,11 +23,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
               ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
             </a>
           </td><td>
-            <a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
-              ${burialSite.cemeteryName
-                ? cityssm.escapeHTML(burialSite.cemeteryName)
-                : '<span class="has-text-grey">(No Name)</span>'}
-            </a>
+          ${burialSite.cemeteryId === null
+                ? '<span class="has-text-grey">(No Cemetery)</span>'
+                : `<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
+              ${burialSite.cemeteryName === ''
+                    ? '<span class="has-text-grey">(No Name)</span>'
+                    : cityssm.escapeHTML(burialSite.cemeteryName)}
+            </a>`}
           </td><td>
             ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
           </td><td>
diff --git a/public/javascripts/burialSite.search.ts b/public/javascripts/burialSite.search.ts
index fc691ed4..34e677a5 100644
--- a/public/javascripts/burialSite.search.ts
+++ b/public/javascripts/burialSite.search.ts
@@ -53,13 +53,17 @@ declare const exports: Record<string, unknown>
               ${cityssm.escapeHTML(burialSite.burialSiteName ?? '')}
             </a>
           </td><td>
-            <a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
+          ${
+            burialSite.cemeteryId === null
+              ? '<span class="has-text-grey">(No Cemetery)</span>'
+              : `<a href="${sunrise.getCemeteryURL(burialSite.cemeteryId)}">
               ${
-                burialSite.cemeteryName
-                  ? cityssm.escapeHTML(burialSite.cemeteryName)
-                  : '<span class="has-text-grey">(No Name)</span>'
+                burialSite.cemeteryName === ''
+                  ? '<span class="has-text-grey">(No Name)</span>'
+                  : cityssm.escapeHTML(burialSite.cemeteryName)
               }
-            </a>
+            </a>`
+          }
           </td><td>
             ${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
           </td><td>
diff --git a/types/record.types.d.ts b/types/record.types.d.ts
index ee293aec..c49b201b 100644
--- a/types/record.types.d.ts
+++ b/types/record.types.d.ts
@@ -10,7 +10,7 @@ export interface BurialSite extends Record {
     burialSiteType?: string;
     burialSiteTypeId?: number;
     cemetery?: Cemetery;
-    cemeteryId?: number;
+    cemeteryId?: number | null;
     cemeteryName?: string;
     cemeterySvg?: string;
     cemeterySvgId?: string;
diff --git a/types/record.types.ts b/types/record.types.ts
index 86fdf154..86db7b54 100644
--- a/types/record.types.ts
+++ b/types/record.types.ts
@@ -14,7 +14,7 @@ export interface BurialSite extends Record {
   burialSiteTypeId?: number
 
   cemetery?: Cemetery
-  cemeteryId?: number
+  cemeteryId?: number | null
   cemeteryName?: string
   cemeterySvg?: string
   cemeterySvgId?: string
diff --git a/views/burialSite-view.ejs b/views/burialSite-view.ejs
index c26bff0d..906a983d 100644
--- a/views/burialSite-view.ejs
+++ b/views/burialSite-view.ejs
@@ -62,9 +62,13 @@
       <div class="column">
         <p class="mb-2">
           <strong>Cemetery</strong><br />
-          <a href="<%= urlPrefix %>/cemeteries/<%= burialSite.cemeteryId %>">
-            <%= burialSite.cemeteryName || "(No Name)" %>
-          </a>
+          <% if (burialSite.cemeteryId === null) { %>
+            <span class="has-text-grey">(No Cemetery)</span>
+          <% } else { %>
+            <a href="<%= urlPrefix %>/cemeteries/<%= burialSite.cemeteryId %>">
+              <%= burialSite.cemeteryName || "(No Name)" %>
+            </a>
+          <% } %>
         </p>
         <p class="mb-2">
           <strong>Burial Site Type</strong><br />