diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
index df84cfccf..2501feb24 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp
@@ -545,12 +545,18 @@ bool Program::UsesExtensionUAV(uint32_t slot, uint32_t space, const byte *bytes,
           tokenStream++;
         }
 
-        uint32_t opspace = ~0U;
         if(sm51)
-          opspace = tokenStream[0];
+        {
+          uint32_t opspace = tokenStream[0];
 
-        if(space == opspace && slot == opreg)
-          return true;
+          if(space == opspace && slot == opreg)
+            return true;
+        }
+        else
+        {
+          if(slot == opreg)
+            return true;
+        }
       }
     }