diff --git a/src/app/service_based_app.cpp b/src/app/service_based_app.cpp
index 7d94887..f5e043c 100644
--- a/src/app/service_based_app.cpp
+++ b/src/app/service_based_app.cpp
@@ -207,7 +207,8 @@ void ServiceBasedApp::RegisterServices() {
     // Render command service
     registry_.RegisterService<services::IRenderCommandService, services::impl::RenderCommandService>(
         registry_.GetService<services::IVulkanDeviceService>(),
-        registry_.GetService<services::ISwapchainService>());
+        registry_.GetService<services::ISwapchainService>(),
+        registry_.GetService<services::ILogger>());
 
     // Graphics service (facade)
     registry_.RegisterService<services::IGraphicsService, services::impl::GraphicsService>(
diff --git a/src/services/impl/render_command_service.cpp b/src/services/impl/render_command_service.cpp
index 503b872..f73471c 100644
--- a/src/services/impl/render_command_service.cpp
+++ b/src/services/impl/render_command_service.cpp
@@ -214,7 +214,7 @@ void RenderCommandService::CreateSyncObjects() {
 }
 
 void RenderCommandService::CleanupCommandResources() {
-    logging::TraceGuard trace;
+    logger_->TraceFunction(__func__);
 
     auto device = deviceService_->GetDevice();
 
@@ -232,7 +232,7 @@ void RenderCommandService::CleanupCommandResources() {
 }
 
 void RenderCommandService::CleanupSyncObjects() {
-    logging::TraceGuard trace;
+    logger_->TraceFunction(__func__);
 
     auto device = deviceService_->GetDevice();