diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 9316bc26b..529f8d3e7 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -1443,6 +1443,9 @@ void D3D12Replay::SavePipelineState()
       for(size_t l = 0; l < it->second.size(); l++)
         res.states[l].name = ToStr(it->second[l]);
 
+      if(res.states.empty())
+        res.states.push_back({"Unknown"});
+
       i++;
     }
   }
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index 437b9f301..9d6337c2c 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -1452,6 +1452,12 @@ void VulkanReplay::SavePipelineState()
         img.layouts[l].numMip = it->second.subresourceStates[l].subresourceRange.levelCount;
       }
 
+      if(img.layouts.empty())
+      {
+        img.layouts.push_back(VKPipe::ImageLayout());
+        img.layouts[0].name = "Unknown";
+      }
+
       i++;
     }
   }