diff --git a/framework/encode/vulkan_state_writer.cpp b/framework/encode/vulkan_state_writer.cpp
index fd2356b9b7..cc0437a54f 100644
--- a/framework/encode/vulkan_state_writer.cpp
+++ b/framework/encode/vulkan_state_writer.cpp
@@ -4189,9 +4189,9 @@ bool VulkanStateWriter::CheckCommandHandle(vulkan_state_info::CommandHandleType
     switch (handle_type)
     {
         case vulkan_state_info::CommandHandleType::BufferHandle:
-            return IsBufferValid(handle_id, state_table);
+            return (state_table.GetBufferWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::BufferViewHandle:
-            return IsBufferViewValid(handle_id, state_table);
+            return (state_table.GetBufferViewWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::CommandBufferHandle:
             return (state_table.GetCommandBufferWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::DescriptorSetHandle:
@@ -4199,11 +4199,11 @@ bool VulkanStateWriter::CheckCommandHandle(vulkan_state_info::CommandHandleType
         case vulkan_state_info::CommandHandleType::EventHandle:
             return (state_table.GetEventWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::FramebufferHandle:
-            return IsFramebufferValid(handle_id, state_table);
+            return (state_table.GetFramebufferWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::ImageHandle:
-            return IsImageValid(handle_id, state_table);
+            return (state_table.GetImageWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::ImageViewHandle:
-            return IsImageViewValid(handle_id, state_table);
+            return (state_table.GetImageViewWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::PipelineHandle:
             return (state_table.GetPipelineWrapper(handle_id) != nullptr);
         case vulkan_state_info::CommandHandleType::PipelineLayoutHandle: