diff --git a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts
index c5a93f77..6e779db4 100644
--- a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts
+++ b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts
@@ -249,10 +249,14 @@ export class ArchivedItemDetail extends TailwindElement {
 
   render() {
     const authToken = this.authState!.headers.Authorization.split(" ")[1];
-    let sectionContent: string | TemplateResult = "";
+    let sectionContent: string | TemplateResult<1> = "";
 
     switch (this.activeTab) {
-      case "qa":
+      case "qa": {
+        if (!this.isCrawler) {
+          sectionContent = "";
+          break;
+        }
         sectionContent = this.renderPanel(
           html`${this.renderTitle(
               html`${msg("Quality Assurance")}
@@ -276,6 +280,7 @@ export class ArchivedItemDetail extends TailwindElement {
           `,
         );
         break;
+      }
       case "replay":
         sectionContent = this.renderPanel(msg("Replay"), this.renderReplay(), [
           tw`overflow-hidden rounded-lg border`,
@@ -478,7 +483,7 @@ export class ArchivedItemDetail extends TailwindElement {
           label: msg("Overview"),
         })}
         ${when(
-          this.itemType === "crawl",
+          this.itemType === "crawl" && this.isCrawler,
           () => html`
             ${renderNavItem({
               section: "qa",
@@ -553,11 +558,13 @@ export class ArchivedItemDetail extends TailwindElement {
                 </sl-button-group>
               `
             : ""}
-          ${this.crawl && this.isCrawler
-            ? this.renderMenu()
-            : html`<sl-skeleton
-                class="h-8 w-24 [--border-radius:theme(borderRadius.sm)]"
-              ></sl-skeleton>`}
+          ${this.isCrawler
+            ? this.crawl
+              ? this.renderMenu()
+              : html`<sl-skeleton
+                  class="h-8 w-24 [--border-radius:theme(borderRadius.sm)]"
+                ></sl-skeleton>`
+            : nothing}
         </div>
       </header>
     `;
diff --git a/frontend/src/pages/org/archived-item-qa/archived-item-qa.ts b/frontend/src/pages/org/archived-item-qa/archived-item-qa.ts
index b58aa56f..2618a7b1 100644
--- a/frontend/src/pages/org/archived-item-qa/archived-item-qa.ts
+++ b/frontend/src/pages/org/archived-item-qa/archived-item-qa.ts
@@ -99,9 +99,6 @@ export class ArchivedItemQA extends TailwindElement {
   @property({ type: String })
   qaRunId?: string;
 
-  @property({ type: Boolean })
-  isCrawler = false;
-
   @property({ type: String })
   tab: QATypes.QATab = "screenshots";
 
@@ -838,7 +835,7 @@ export class ArchivedItemQA extends TailwindElement {
       );
     } catch {
       this.notify.toast({
-        message: msg("Sorry, couldn't retrieve QA data at this time."),
+        message: msg("Sorry, couldn't retrieve analysis runs at this time."),
         variant: "danger",
         icon: "exclamation-octagon",
       });
diff --git a/frontend/src/pages/org/index.ts b/frontend/src/pages/org/index.ts
index 54b23ff2..923e1468 100644
--- a/frontend/src/pages/org/index.ts
+++ b/frontend/src/pages/org/index.ts
@@ -527,7 +527,13 @@ export class Org extends LiteElement {
 
     if (params.itemId) {
       if (params.qaTab) {
-        return html` <btrix-archived-item-qa
+        if (!this.isCrawler) {
+          return html`<btrix-not-found
+            class="flex items-center justify-center"
+          ></btrix-not-found>`;
+        }
+
+        return html`<btrix-archived-item-qa
           class="flex-1"
           .authState=${this.authState!}
           orgId=${this.orgId}
@@ -535,7 +541,6 @@ export class Org extends LiteElement {
           itemPageId=${ifDefined(params.itemPageId)}
           qaRunId=${ifDefined(params.qaRunId)}
           tab=${params.qaTab}
-          ?isCrawler=${this.isCrawler}
         ></btrix-archived-item-qa>`;
       }