diff --git a/renderdoc/driver/ihv/nv/nvapi_hooks.cpp b/renderdoc/driver/ihv/nv/nvapi_hooks.cpp
index fcfe5a496..e6ddd7634 100644
--- a/renderdoc/driver/ihv/nv/nvapi_hooks.cpp
+++ b/renderdoc/driver/ihv/nv/nvapi_hooks.cpp
@@ -168,13 +168,8 @@ private:
     // is a COM-breaking backdoor
     if(SUCCEEDED(hr))
     {
-      NvAPI_Status ret = nvhooks.NvAPI_D3D11_IsNvShaderExtnOpCodeSupported()(nvapiDev->GetReal(),
-                                                                             opCode, pSupported);
-
-      if(pSupported)
-        *pSupported = (*pSupported && SupportedOpcode((NvShaderOpcode)opCode)) ? TRUE : FALSE;
-
-      return ret;
+      return nvhooks.NvAPI_D3D11_IsNvShaderExtnOpCodeSupported()(nvapiDev->GetReal(), opCode,
+                                                                 pSupported);
     }
     else
     {
@@ -204,9 +199,6 @@ private:
 
         dev->Release();
 
-        if(pSupported)
-          *pSupported = (*pSupported && SupportedOpcode((NvShaderOpcode)opCode)) ? TRUE : FALSE;
-
         return ret;
       }
     }
diff --git a/renderdoc/driver/ihv/nv/nvapi_wrapper.cpp b/renderdoc/driver/ihv/nv/nvapi_wrapper.cpp
index da40e1de7..7ee9c4517 100644
--- a/renderdoc/driver/ihv/nv/nvapi_wrapper.cpp
+++ b/renderdoc/driver/ihv/nv/nvapi_wrapper.cpp
@@ -36,9 +36,6 @@ namespace
 #include "official/nvapi/nvapi_interface.h"
 };
 
-RDOC_CONFIG(bool, NV_nvapi_AllowUnknownShaderOpcodes, false,
-            "Allow shader opcodes that we don't support in debugging or disassembly.");
-
 typedef void *(*PFN_nvapi_QueryInterface)(NvU32 id);
 
 struct ReplayNVAPID3DDevice : INVAPID3DDevice
@@ -149,13 +146,6 @@ uint32_t getId(const char *name)
   return 0;
 }
 
-bool SupportedOpcode(NvShaderOpcode opcode)
-{
-  if(NV_nvapi_AllowUnknownShaderOpcodes())
-    return true;
-  return opcode == NvShaderOpcode::U64Atomic;
-}
-
 // try to initialise nvapi for replay
 INVAPID3DDevice *InitialiseNVAPIReplay()
 {
diff --git a/renderdoc/driver/ihv/nv/nvapi_wrapper.h b/renderdoc/driver/ihv/nv/nvapi_wrapper.h
index 29b2ab499..533de2074 100644
--- a/renderdoc/driver/ihv/nv/nvapi_wrapper.h
+++ b/renderdoc/driver/ihv/nv/nvapi_wrapper.h
@@ -81,4 +81,3 @@ INVAPID3DDevice : public IUnknown
 };
 
 INVAPID3DDevice *InitialiseNVAPIReplay();
-bool SupportedOpcode(NvShaderOpcode opcode);