diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
index 15b9ba2856..93770c7c34 100644
--- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
+++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
@@ -256,7 +256,7 @@ function SavedQueryList({
           },
         }: any) => {
           const names = tables.map((table: any) => table.table);
-          const main = names.shift();
+          const main = names.length > 0 ? names.shift() : '';
 
           if (names.length) {
             return (