diff --git a/Engine/source/gfx/gl/gfxGLCardProfiler.cpp b/Engine/source/gfx/gl/gfxGLCardProfiler.cpp
index 760a0d5ed..09ddfb53a 100644
--- a/Engine/source/gfx/gl/gfxGLCardProfiler.cpp
+++ b/Engine/source/gfx/gl/gfxGLCardProfiler.cpp
@@ -66,7 +66,11 @@ void GFXGLCardProfiler::setupCardCapabilities()
    setCapability("GL_EXT_texture_filter_anisotropic", gglHasExtension(EXT_texture_filter_anisotropic));
 
    // Check for buffer storage
+#ifdef TORQUE_NSIGHT_WORKAROUND
+   setCapability("GL_ARB_buffer_storage", false);
+#else
    setCapability("GL_ARB_buffer_storage", gglHasExtension(ARB_buffer_storage));
+#endif
 
    // Check for shader model 5.0
    setCapability("GL_ARB_gpu_shader5", gglHasExtension(ARB_gpu_shader5));
diff --git a/Engine/source/gfx/gl/gfxGLDevice.cpp b/Engine/source/gfx/gl/gfxGLDevice.cpp
index 190de2f5a..e3a1907bc 100644
--- a/Engine/source/gfx/gl/gfxGLDevice.cpp
+++ b/Engine/source/gfx/gl/gfxGLDevice.cpp
@@ -165,9 +165,6 @@ void GFXGLDevice::initGLState()
       glBindFramebuffer = &_t3d_glBindFramebuffer;
    }
 
-#ifdef TORQUE_NSIGHT_WORKAROUND
-   __GLEW_ARB_buffer_storage = false;
-#endif
 #if TORQUE_DEBUG
    if( gglHasExtension(ARB_debug_output) )
    {