diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp
index 1d3f3d31b..f426fb88a 100644
--- a/src/Magnum/Shader.cpp
+++ b/src/Magnum/Shader.cpp
@@ -441,8 +441,7 @@ Int Shader::maxUniformBlocks(const Type type) {
         GL_MAX_VERTEX_UNIFORM_BLOCKS,
         GL_MAX_FRAGMENT_UNIFORM_BLOCKS,
         #ifndef MAGNUM_TARGET_GLES
-        /** @todo Fix this when glLoadGen has `GL_MAX_GEOMETRY_UNIFORM_BLOCKS` enum */
-        0x8A2C, //GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
+        GL_MAX_GEOMETRY_UNIFORM_BLOCKS,
         GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS,
         GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS,
         GL_MAX_COMPUTE_UNIFORM_BLOCKS
@@ -524,8 +523,7 @@ Int Shader::maxCombinedUniformComponents(const Type type) {
         GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
         #ifndef MAGNUM_TARGET_GLES
-        /** @todo Fix this when glLoadGen has `GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS` enum */
-        0x8A32, //GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS,
+        GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS,
         GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS