diff --git a/src/util/opengl_device.cpp b/src/util/opengl_device.cpp
index 78dbf2bf1..3d7e1f57b 100644
--- a/src/util/opengl_device.cpp
+++ b/src/util/opengl_device.cpp
@@ -333,6 +333,9 @@ bool OpenGLDevice::CreateDevice(const std::string_view& adapter, bool threaded_p
   if (!CreateBuffers(buggy_pbo))
     return false;
 
+  // Scissor test should always be enabled.
+  glEnable(GL_SCISSOR_TEST);
+
   return true;
 }
 
diff --git a/src/util/opengl_pipeline.cpp b/src/util/opengl_pipeline.cpp
index c614557c1..c6cc5b9a0 100644
--- a/src/util/opengl_pipeline.cpp
+++ b/src/util/opengl_pipeline.cpp
@@ -595,9 +595,6 @@ ALWAYS_INLINE static void ApplyRasterizationState(const GPUPipeline::Rasterizati
     glEnable(GL_CULL_FACE);
     glCullFace((rs.cull_mode == GPUPipeline::CullMode::Front) ? GL_FRONT : GL_BACK);
   }
-
-  // TODO: always enabled, should be done at init time
-  glEnable(GL_SCISSOR_TEST);
 }
 
 ALWAYS_INLINE static void ApplyDepthState(const GPUPipeline::DepthState& ds)