diff --git a/framework/decode/vulkan_buffer_tracker.cpp b/framework/decode/vulkan_buffer_tracker.cpp
index 3357607c5..e017bee9c 100644
--- a/framework/decode/vulkan_buffer_tracker.cpp
+++ b/framework/decode/vulkan_buffer_tracker.cpp
@@ -38,11 +38,6 @@ void decode::VulkanBufferTracker::TrackBuffer(const decode::BufferInfo* buffer_i
         {
             _capture_addresses[buffer_info->capture_address] = buffer_info->capture_id;
         }
-
-        if (buffer_info->replay_address != 0)
-        {
-            _replay_addresses[buffer_info->replay_address] = buffer_info->capture_id;
-        }
     }
 }
 
@@ -51,16 +46,9 @@ void VulkanBufferTracker::RemoveBuffer(const BufferInfo* buffer_info)
     if (buffer_info != nullptr)
     {
         _capture_addresses.erase(buffer_info->capture_address);
-        _replay_addresses.erase(buffer_info->replay_address);
     }
 }
 
-const decode::BufferInfo*
-decode::VulkanBufferTracker::GetBufferByReplayDeviceAddress(VkDeviceAddress replay_address) const
-{
-    return GetBufferInfo(replay_address, _replay_addresses);
-}
-
 const decode::BufferInfo*
 decode::VulkanBufferTracker::GetBufferByCaptureDeviceAddress(VkDeviceAddress capture_address) const
 {
diff --git a/framework/decode/vulkan_buffer_tracker.h b/framework/decode/vulkan_buffer_tracker.h
index 284406937..ab230ba18 100644
--- a/framework/decode/vulkan_buffer_tracker.h
+++ b/framework/decode/vulkan_buffer_tracker.h
@@ -58,14 +58,6 @@ class VulkanBufferTracker
      */
     void RemoveBuffer(const BufferInfo* buffer_info);
 
-    /**
-     * @brief   Retrieve a buffer by providing a replay-time VkDeviceAddress within its range.
-     *
-     * @param   replay_address  a replay-time VkDeviceAddress pointing inside a buffer.
-     * @return  a const-pointer to a found BufferInfo or nullptr.
-     */
-    [[nodiscard]] const BufferInfo* GetBufferByReplayDeviceAddress(VkDeviceAddress replay_address) const;
-
     /**
      * @brief   Retrieve a buffer by providing a capture-time VkDeviceAddress within its range.
      *
@@ -82,7 +74,7 @@ class VulkanBufferTracker
                                                   const device_address_map_t& address_map) const;
 
     const VulkanObjectInfoTable& _object_info_table;
-    device_address_map_t         _capture_addresses, _replay_addresses;
+    device_address_map_t         _capture_addresses;
 };
 
 GFXRECON_END_NAMESPACE(decode)