diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
index 4acd610f2..c7f38d73b 100644
--- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
@@ -134,6 +134,9 @@ TBuiltInResource DefaultResources =
 
 string CompileSPIRV(SPIRVShaderStage shadType, const std::vector<std::string> &sources, vector<uint32_t> &spirv)
 {
+#if defined(RELEASE)
+	return "SPIR-V disassembly disabled due to glslang instability";
+#else
 	if(shadType >= eSPIRVInvalid)
 		return "Invalid shader stage specified";
 
@@ -202,4 +205,5 @@ string CompileSPIRV(SPIRVShaderStage shadType, const std::vector<std::string> &s
 	delete[] strs;
 
 	return errors;
+#endif
 }
diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
index d3abd9b32..26d613954 100644
--- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
@@ -49,6 +49,9 @@ static string OptionalFlagString(EnumType e)
 
 void DisassembleSPIRV(SPIRVShaderStage shadType, const vector<uint32_t> &spirv, string &disasm)
 {
+#if defined(RELEASE)
+	return;
+#else
 	if(shadType >= eSPIRVInvalid)
 		return;
 
@@ -678,6 +681,7 @@ void DisassembleSPIRV(SPIRVShaderStage shadType, const vector<uint32_t> &spirv,
 	}
 
 	return;
+#endif
 }
 
 template<>