diff --git a/src/app/service_based_app.cpp b/src/app/service_based_app.cpp
index fe52364..572e45a 100644
--- a/src/app/service_based_app.cpp
+++ b/src/app/service_based_app.cpp
@@ -199,7 +199,8 @@ void ServiceBasedApp::RegisterServices() {
 
     // Buffer service
     registry_.RegisterService<services::IBufferService, services::impl::BufferService>(
-        registry_.GetService<services::IVulkanDeviceService>());
+        registry_.GetService<services::IVulkanDeviceService>(),
+        registry_.GetService<services::ILogger>());
 
     // Render command service
     registry_.RegisterService<services::IRenderCommandService, services::impl::RenderCommandService>(
diff --git a/src/services/impl/buffer_service.cpp b/src/services/impl/buffer_service.cpp
index 8bcdc43..7815e57 100644
--- a/src/services/impl/buffer_service.cpp
+++ b/src/services/impl/buffer_service.cpp
@@ -100,7 +100,7 @@ void BufferService::CreateBuffer(VkDeviceSize size, VkBufferUsageFlags usage,
 }
 
 void BufferService::CleanupBuffers() {
-    logging::TraceGuard trace;
+    logger_->TraceFunction(__func__);
 
     auto device = deviceService_->GetDevice();
 
@@ -128,4 +128,9 @@ void BufferService::CleanupBuffers() {
     indexCount_ = 0;
 }
 
+void BufferService::Shutdown() noexcept {
+    logger_->TraceFunction(__func__);
+    CleanupBuffers();
+}
+
 }  // namespace sdl3cpp::services::impl