diff --git a/src/d3d8/d3d8_device.cpp b/src/d3d8/d3d8_device.cpp
index 457902fa2..ef170f7c9 100644
--- a/src/d3d8/d3d8_device.cpp
+++ b/src/d3d8/d3d8_device.cpp
@@ -1089,10 +1089,13 @@ namespace dxvk {
 
     if (likely(SUCCEEDED(res))) {
       m_token++;
-      m_stateBlocks.emplace(std::piecewise_construct,
-                            std::forward_as_tuple(m_token),
-                            std::forward_as_tuple(this, Type, pStateBlock9.ref()));
+      auto stateBlockIterPair = m_stateBlocks.emplace(std::piecewise_construct,
+                                                      std::forward_as_tuple(m_token),
+                                                      std::forward_as_tuple(this, Type, pStateBlock9.ref()));
       *pToken = m_token;
+
+      // D3D8 state blocks automatically capture state on creation.
+      stateBlockIterPair.first->second.Capture();
     }
 
     return res;