diff --git a/interface/hooks/useIsLocationIndexing.ts b/interface/hooks/useIsLocationIndexing.ts
index 0e50c08f2..416715225 100644
--- a/interface/hooks/useIsLocationIndexing.ts
+++ b/interface/hooks/useIsLocationIndexing.ts
@@ -14,7 +14,7 @@ export const useIsLocationIndexing = (locationId: number): boolean => {
 	const isLocationIndexing =
 		jobGroups?.some((group) =>
 			group.jobs.some((job) => {
-				if (job.name === 'indexer' && job.metadata.location.id === locationId) {
+				if (job.name === 'indexer' && job.metadata.location.id === locationId && (job.status === 'Running' || job.status === 'Queued')) {
 					return job.completed_task_count === 0;
 				}
 			})