diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5b10a43a0a..e76fe74219 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2061,7 +2061,6 @@ bool LLAppViewer::cleanup()
 	// LLViewerCamera::deleteSingleton();
 
 	// LL_INFOS() << "Viewer disconnected" << LL_ENDL;
-	LLViewerCamera::deleteSingleton();
 	// </FS:Beq>
 	if (gKeyboard)
 	{
@@ -4866,6 +4865,7 @@ void LLAppViewer::forceQuit()
 {
 	// <FS:Beq> [FIRE-32453] [BUG-232971] disconnect sooner to force the cache write.
 	disconnectViewer();
+	LLViewerCamera::deleteSingleton();
 	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
 	// </FS:Beq>
 	LLApp::setQuitting();