diff --git a/qrenderdoc/Code/ReplayManager.cpp b/qrenderdoc/Code/ReplayManager.cpp
index 627cb5b11..839ecbc04 100644
--- a/qrenderdoc/Code/ReplayManager.cpp
+++ b/qrenderdoc/Code/ReplayManager.cpp
@@ -350,10 +350,10 @@ void ReplayManager::DisconnectFromRemoteServer()
     {
       m_Remote->ShutdownConnection();
     }
+    m_Remote = NULL;
   }
 
   m_RemoteHost = RemoteHost();
-  m_Remote = NULL;
 }
 
 void ReplayManager::ShutdownServer()
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index b399c9653..b83a67413 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -488,6 +488,8 @@ MainWindow::~MainWindow()
   m_NetManagerThread->thread()->quit();
   m_NetManagerThread->deleteLater();
 
+  m_Ctx.Replay().DisconnectFromRemoteServer();
+
   // explicitly delete our children here, so that the MainWindow is still alive while they are
   // closing.