diff --git a/frontend/src2/charts/components/DrillDown.vue b/frontend/src2/charts/components/DrillDown.vue
index 918802dd..584dda01 100644
--- a/frontend/src2/charts/components/DrillDown.vue
+++ b/frontend/src2/charts/components/DrillDown.vue
@@ -30,8 +30,14 @@ watch(
 		)
 		if (query) {
 			drillDownQuery.value = query
-			drillDownQuery.value.execute()
-			showDrillDownResults.value = true
+			drillDownQuery.value
+				.execute()
+				.then(() => {
+					showDrillDownResults.value = true
+				})
+				.catch(() => {
+					showDrillDownResults.value = false
+				})
 		}
 	},
 	{ immediate: true, deep: true }
diff --git a/frontend/src2/query/query.ts b/frontend/src2/query/query.ts
index 98040e34..8e80acab 100644
--- a/frontend/src2/query/query.ts
+++ b/frontend/src2/query/query.ts
@@ -202,11 +202,6 @@ export function makeQuery(workbookQuery: WorkbookQuery) {
 			const queryTable = getCachedQuery(op.table.query_name)
 			if (!queryTable) {
 				const message = `Query ${op.table.query_name} not found`
-				createToast({
-					variant: 'error',
-					title: 'Error',
-					message,
-				})
 				throw new Error(message)
 			}