diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 9818ec51ec..03aa67d81c 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -136,7 +136,8 @@ AppServer::~AppServer()
 	gScreenManager->Lock();
 	gScreenManager->Quit();
 
-	delete gFontManager;
+	gFontManager->Lock();
+	gFontManager->Quit();
 }
 
 
diff --git a/src/servers/app/drawing/ViewHWInterface.cpp b/src/servers/app/drawing/ViewHWInterface.cpp
index ae74523fcb..5d97ed3a5c 100644
--- a/src/servers/app/drawing/ViewHWInterface.cpp
+++ b/src/servers/app/drawing/ViewHWInterface.cpp
@@ -371,6 +371,8 @@ ViewHWInterface::~ViewHWInterface()
 	delete fBackBuffer;
 	delete fFrontBuffer;
 
+	be_app->Lock();
+	be_app->Quit();
 	delete be_app;
 }