diff --git a/kiwano/platform/Application.cpp b/kiwano/platform/Application.cpp
index 481fd2bf..5c79b207 100644
--- a/kiwano/platform/Application.cpp
+++ b/kiwano/platform/Application.cpp
@@ -143,7 +143,14 @@ namespace kiwano
 			{
 				(*iter)->DestroyComponent();
 			}
+			components_.clear();
 		}
+
+		// Destroy all instances
+		Renderer::Destroy();
+		Input::Destroy();
+		Window::Destroy();
+		Logger::Destroy();
 	}
 
 	void Application::Use(Component* component)