diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 2ff35be02..c040abcd5 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -2319,11 +2319,11 @@ void GLReplay::GetTextureData(ResourceId tex, const Subresource &sub,
     else if(params.remap == RemapTexture::RGBA32)
       remapFormat = eGL_RGBA32F;
 
-    CompType typeCast = params.typeCast;
+    CompType typeCast = BaseRemapType(params.typeCast);
     if(typeCast == CompType::Typeless && IsSRGBFormat(intFormat))
       typeCast = CompType::UNormSRGB;
 
-    remapFormat = GetViewCastedFormat(remapFormat, BaseRemapType(typeCast));
+    remapFormat = GetViewCastedFormat(remapFormat, typeCast);
 
     if(intFormat != remapFormat)
     {