diff --git a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/ExternalEventDefTable.tsx b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/ExternalEventDefTable.tsx
index fbd75a5ba..0b68db321 100644
--- a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/ExternalEventDefTable.tsx
+++ b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/ExternalEventDefTable.tsx
@@ -1,11 +1,10 @@
 import { ExternalEventDefId } from 'littlehorse-client/proto'
-import LinkWithTenant from '../LinkWithTenant'
 import { FC, Fragment } from 'react'
 import { SearchResultProps } from '.'
 import { SelectionLink } from '../SelectionLink'
 
 export const ExternalEventDefTable: FC<SearchResultProps> = ({ pages = [] }) => {
-  if (pages.length === 0) {
+  if (pages.every(page => page.results.length === 0)) {
     return <div className="flex min-h-[360px] items-center justify-center text-center italic">No ExternalEventDefs</div>
   }
 
diff --git a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/TaskDefTable.tsx b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/TaskDefTable.tsx
index 04fad463b..57da5c5b6 100644
--- a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/TaskDefTable.tsx
+++ b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/TaskDefTable.tsx
@@ -1,13 +1,13 @@
 import { TaskDefId } from 'littlehorse-client/proto'
+import { useParams } from 'next/navigation'
 import { FC, Fragment } from 'react'
 import { SearchResultProps } from '.'
-import { useParams } from 'next/navigation'
 import { SelectionLink } from '../SelectionLink'
 
 export const TaskDefTable: FC<SearchResultProps> = ({ pages = [] }) => {
   const { tenantId } = useParams()
 
-  if (pages.length === 0) {
+  if (pages.every(page => page.results.length === 0)) {
     return <div className="flex min-h-[360px] items-center justify-center text-center italic">No TaskDefs</div>
   }
 
diff --git a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/UserTaskDefTable.tsx b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/UserTaskDefTable.tsx
index d6900ad29..7ba79ac8a 100644
--- a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/UserTaskDefTable.tsx
+++ b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/UserTaskDefTable.tsx
@@ -1,4 +1,3 @@
-import { Separator } from '@/components/ui/separator'
 import { UserTaskDefId } from 'littlehorse-client/proto'
 import { FC, Fragment } from 'react'
 import { SearchResultProps } from '.'
@@ -6,7 +5,7 @@ import { SelectionLink } from '../SelectionLink'
 import VersionTag from '../VersionTag'
 
 export const UserTaskDefTable: FC<SearchResultProps> = ({ pages = [] }) => {
-  if (pages.length === 0) {
+  if (pages.every(page => page.results.length === 0)) {
     return <div className="flex min-h-[360px] items-center justify-center text-center italic">No UserTaskDefs</div>
   }
 
diff --git a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WfSpecTable.tsx b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WfSpecTable.tsx
index e06588505..db63d11ce 100644
--- a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WfSpecTable.tsx
+++ b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WfSpecTable.tsx
@@ -16,7 +16,7 @@ export const WfSpecTable: FC<SearchResultProps> = ({ pages = [] }) => {
     getLatestWfSpecs(tenantId, wfSpecNames).then(setWfSpecs)
   }, [pages, tenantId])
 
-  if (pages.length === 0) {
+  if (pages.every(page => page.results.length === 0)) {
     return <div className="flex min-h-[360px] items-center justify-center text-center italic">No WfSpecs</div>
   }
 
diff --git a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WorkflowEventDefTable.tsx b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WorkflowEventDefTable.tsx
index 4a7d09477..1e4767187 100644
--- a/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WorkflowEventDefTable.tsx
+++ b/dashboard/src/app/(authenticated)/[tenantId]/components/tables/WorkflowEventDefTable.tsx
@@ -1,14 +1,14 @@
 import { WorkflowEventDefId } from 'littlehorse-client/proto'
+import { useParams } from 'next/navigation'
 import { FC, Fragment } from 'react'
 import { SearchResultProps } from '.'
-import { useParams } from 'next/navigation'
 import LinkWithTenant from '../LinkWithTenant'
 import { SelectionLink } from '../SelectionLink'
 
 export const WorkflowEventDefTable: FC<SearchResultProps> = ({ pages = [] }) => {
   const { tenantId } = useParams()
 
-  if (pages.length === 0) {
+  if (pages.every(page => page.results.length === 0)) {
     return <div className="flex min-h-[360px] items-center justify-center text-center italic">No WorkflowEventDefs</div>
   }