diff --git a/src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs b/src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs
index bde538c4e1..fa2b842f9c 100644
--- a/src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs
+++ b/src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs
@@ -141,6 +141,8 @@ public partial class Dispatcher
                 else
                 {
                     operation = null;
+                    _impl.UpdateTimer(null);
+                    _hasShutdownFinished = true;
                 }
             }
 
@@ -150,8 +152,6 @@ public partial class Dispatcher
             }
         } while (operation != null);
 
-        _impl.UpdateTimer(null);
-        _hasShutdownFinished = true;
         ShutdownFinished?.Invoke(this, EventArgs.Empty);
     }
 
@@ -213,4 +213,4 @@ public partial class Dispatcher
         return new DispatcherProcessingDisabled(this, oldContext);
 
     }
-}
\ No newline at end of file
+}