diff --git a/server/src/main/java/io/deephaven/server/session/SessionState.java b/server/src/main/java/io/deephaven/server/session/SessionState.java
index 487f4099c44..22e127d80d8 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionState.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionState.java
@@ -825,6 +825,7 @@ private synchronized void setState(final ExportNotification.State state) {
                 } catch (final Exception err) {
                     log.error().append("Unexpected error while reporting success: ").append(err).endl();
                 }
+                successHandler = null;
             }
 
             if (isNowExported || isExportStateTerminal(state)) {
@@ -834,6 +835,7 @@ private synchronized void setState(final ExportNotification.State state) {
                 parents = Collections.emptyList();
                 exportMain = null;
                 errorHandler = null;
+                successHandler = null;
             }
 
             if ((isNowExported && isNonExport()) || isExportStateTerminal(state)) {