diff --git a/cMake/FreeCAD_Helpers/SetupOpenGL.cmake b/cMake/FreeCAD_Helpers/SetupOpenGL.cmake
index 4ce3924817..1999087981 100644
--- a/cMake/FreeCAD_Helpers/SetupOpenGL.cmake
+++ b/cMake/FreeCAD_Helpers/SetupOpenGL.cmake
@@ -1,6 +1,11 @@
 macro(SetupOpenGL)
 # -------------------------------- OpenGL --------------------------------
 
+    # If on a system with both a legacy GL library and GLVND, prefer the legacy library.
+    # This is probably needed until we no longer have any gl.*ARB calls in the codebase
+    # See, e.g. SoBrepFaceSet.cpp
+    set(OpenGL_GL_PREFERENCE LEGACY)
+
     find_package(OpenGL)
     include(FindPackageMessage)
     if(OPENGL_GLU_FOUND)