diff --git a/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp b/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp
index 9711ede1..42a0b621 100644
--- a/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp
+++ b/app/src/main/cpp/skyline/gpu/interconnect/command_executor.cpp
@@ -316,6 +316,9 @@ namespace skyline::gpu::interconnect {
     }
 
     void CommandExecutor::Submit() {
+        for (const auto &callback : flushCallbacks)
+            callback();
+
         if (!nodes.empty()) {
             TRACE_EVENT("gpu", "CommandExecutor::Submit");
             SubmitInternal();
@@ -330,6 +333,9 @@ namespace skyline::gpu::interconnect {
     }
 
     void CommandExecutor::SubmitWithFlush() {
+        for (const auto &callback : flushCallbacks)
+            callback();
+
         if (!nodes.empty()) {
             TRACE_EVENT("gpu", "CommandExecutor::SubmitWithFlush");
             SubmitInternal();
diff --git a/app/src/main/cpp/skyline/soc/gm20b/gpfifo.cpp b/app/src/main/cpp/skyline/soc/gm20b/gpfifo.cpp
index a3320061..c901d159 100644
--- a/app/src/main/cpp/skyline/soc/gm20b/gpfifo.cpp
+++ b/app/src/main/cpp/skyline/soc/gm20b/gpfifo.cpp
@@ -336,7 +336,6 @@ namespace skyline::soc::gm20b {
                 break;
         }
 
-        channelCtx.maxwell3D->FlushEngineState();
         channelCtx.executor.Submit();
     }