diff --git a/engine/context/src/main/java/io/deephaven/engine/context/QueryCompiler.java b/engine/context/src/main/java/io/deephaven/engine/context/QueryCompiler.java
index 05502ff4812..0302ea55d9a 100644
--- a/engine/context/src/main/java/io/deephaven/engine/context/QueryCompiler.java
+++ b/engine/context/src/main/java/io/deephaven/engine/context/QueryCompiler.java
@@ -975,6 +975,7 @@ private boolean maybeCreateClassHelper2(
                         // This source actually succeeded in compiling, but was not written because some other source
                         // failed to compile. Let's schedule this work to try again.
                         toRetry.add(request);
+                        return;
                     }
                 }
 
diff --git a/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java b/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
index aa00c48473d..aa19e47dc45 100644
--- a/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
+++ b/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
@@ -299,24 +299,15 @@ public void testMultiCompileWithFailure() throws ExecutionException, Interrupted
                         CompletionStageFutureImpl.make(),
                 };
 
-        Exception firstErr;
         try {
             ExecutionContext.getContext().getQueryCompiler().compile(requests, resolvers);
             // noinspection DataFlowIssue
             throw Assert.statementNeverExecuted();
-        } catch (Exception err) {
-            firstErr = err;
+        } catch (Exception ignored) {
         }
 
         Assert.eqTrue(resolvers[0].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
         Assert.eqTrue(resolvers[1].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
         Assert.neqNull(resolvers[1].getFuture().get(), "resolvers[1].getFuture().get()");
-        try {
-            resolvers[0].getFuture().get();
-            // noinspection DataFlowIssue
-            throw Assert.statementNeverExecuted();
-        } catch (ExecutionException err) {
-            Assert.eq(firstErr, "firstErr", err.getCause(), "err");
-        }
     }
 }