diff --git a/src/LyX.cpp b/src/LyX.cpp
index 895cbcbfb6..db9e92033a 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -471,6 +471,15 @@ void LyX::prepareExit()
 	// close buffers first
 	pimpl_->buffer_list_.closeAll();
 
+	// register session changes and shutdown server and socket
+	if (use_gui) {
+		if (pimpl_->session_)
+			pimpl_->session_->writeFile();
+		pimpl_->session_.reset();
+		pimpl_->lyx_server_.reset();
+		pimpl_->lyx_socket_.reset();
+	}
+
 	// do any other cleanup procedures now
 	if (package().temp_dir() != package().system_temp_dir()) {
 		LYXERR(Debug::INFO, "Deleting tmp dir "
@@ -484,14 +493,6 @@ void LyX::prepareExit()
 		}
 	}
 
-	if (use_gui) {
-		if (pimpl_->session_)
-			pimpl_->session_->writeFile();
-		pimpl_->session_.reset();
-		pimpl_->lyx_server_.reset();
-		pimpl_->lyx_socket_.reset();
-	}
-
 	// Kill the application object before exiting. This avoids crashes
 	// when exiting on Linux.
 	if (pimpl_->application_)