diff --git a/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte b/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
index c7fb043583..018901a10f 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
@@ -102,7 +102,8 @@
 						{/if}
 					</div>
 				</Button>
-				{$table.getState().pagination.pageIndex + 1} of {$table.getPageCount()}
+				{$table.getState().pagination.pageIndex + 1}
+				{$table.getPageCount() > 0 ? ` of ${$table.getPageCount()}` : ''}
 			</div>
 		{:else}
 			<div />
diff --git a/frontend/src/lib/components/apps/components/layout/AppList.svelte b/frontend/src/lib/components/apps/components/layout/AppList.svelte
index da0025f3e8..a92dcbc35a 100644
--- a/frontend/src/lib/components/apps/components/layout/AppList.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppList.svelte
@@ -204,7 +204,7 @@
 						page = page + 1
 						outputs?.page.set(page, true)
 					}}
-					disabled={pagination.disableNext}
+					disabled={pagination.disableNext && pagination.total > 0}
 				>
 					<div class="flex flex-row gap-1 items-center">
 						Next
@@ -216,7 +216,7 @@
 						{/if}
 					</div>
 				</Button>
-				<div class="text-xs">{page + 1} of {pagination.total}</div>
+				<div class="text-xs">{page + 1} {pagination.total > 0 ? `of ${pagination.total}` : ''}</div>
 			</div>
 		{/if}
 	</div>