diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conquery/SqlExecutionManager.java b/backend/src/main/java/com/bakdata/conquery/sql/conquery/SqlExecutionManager.java
index 5fb2e663ad..aa785bb5f3 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conquery/SqlExecutionManager.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conquery/SqlExecutionManager.java
@@ -78,6 +78,11 @@ private CompletableFuture<Void> executeAsync(ManagedQuery managedQuery) {
 									managedQuery.setLastResultCount(((long) result.getRowCount()));
 									managedQuery.finish(ExecutionState.DONE);
 									runningExecutions.remove(managedQuery.getId());
+								})
+								.exceptionally(e -> {
+									managedQuery.finish(ExecutionState.FAILED);
+									runningExecutions.remove(managedQuery.getId());
+									return null;
 								});
 	}