diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index d5d2542cc5..4b6db1da45 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -66,8 +66,10 @@
 // Enable picking using raytracing
 #define ENABLE_RAYCAST_PICKING (1 && ENABLE_LEGACY_OPENGL_REMOVAL)
 #define ENABLE_RAYCAST_PICKING_DEBUG (0 && ENABLE_RAYCAST_PICKING)
+// Enable Measure Gizmo
+#define ENABLE_MEASURE_GIZMO (1 && ENABLE_LEGACY_OPENGL_REMOVAL)
 // Enable debug code for Measure Gizmo
-#define ENABLE_MEASURE_GIZMO_DEBUG (0 && ENABLE_2_5_0_ALPHA1)
+#define ENABLE_MEASURE_GIZMO_DEBUG (0 && ENABLE_MEASURE_GIZMO)
 
 
 #endif // _prusaslicer_technologies_h_
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
index d7a8f53f46..73ee87840a 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
@@ -14,6 +14,8 @@
 
 #include <GL/glew.h>
 
+#if ENABLE_MEASURE_GIZMO
+
 namespace Slic3r {
 namespace GUI {
 
@@ -261,20 +263,6 @@ void GLGizmoMeasure::on_render()
 
 
 
-#if ! ENABLE_LEGACY_OPENGL_REMOVAL
-    #error NOT IMPLEMENTED
-#endif
-#if ! ENABLE_GL_SHADERS_ATTRIBUTES
-    #error NOT IMPLEMENTED
-#endif
-
-void GLGizmoMeasure::on_render_for_picking()
-{
-}
-
-
-
-
 void GLGizmoMeasure::update_if_needed()
 {
     auto update_plane_models_cache = [this](const indexed_triangle_set& its) {
@@ -354,3 +342,5 @@ void GLGizmoMeasure::update_if_needed()
 
 } // namespace GUI
 } // namespace Slic3r
+
+#endif // ENABLE_MEASURE_GIZMO
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
index 129175f159..218b5e8757 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp
@@ -1,15 +1,10 @@
 #ifndef slic3r_GLGizmoMeasure_hpp_
 #define slic3r_GLGizmoMeasure_hpp_
 
+#if ENABLE_MEASURE_GIZMO
+
 #include "GLGizmoBase.hpp"
-#if ENABLE_LEGACY_OPENGL_REMOVAL
 #include "slic3r/GUI/GLModel.hpp"
-#else
-#include "slic3r/GUI/3DScene.hpp"
-#endif // ENABLE_LEGACY_OPENGL_REMOVAL
-
-
-#include <memory>
 
 namespace Slic3r {
 
@@ -81,4 +76,6 @@ protected:
 } // namespace GUI
 } // namespace Slic3r
 
+#endif // ENABLE_MEASURE_GIZMO
+
 #endif // slic3r_GLGizmoMeasure_hpp_
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index 6d25f84fbc..ff24dd84a3 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -21,7 +21,9 @@
 #include "slic3r/GUI/Gizmos/GLGizmoSeam.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoSimplify.hpp"
+#if ENABLE_MEASURE_GIZMO
 #include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp"
+#endif // ENABLE_MEASURE_GIZMO
 
 #include "libslic3r/format.hpp"
 #include "libslic3r/Model.hpp"
@@ -107,7 +109,9 @@ bool GLGizmosManager::init()
     m_gizmos.emplace_back(new GLGizmoSeam(m_parent, "seam.svg", 8));
     m_gizmos.emplace_back(new GLGizmoMmuSegmentation(m_parent, "mmu_segmentation.svg", 9));
     m_gizmos.emplace_back(new GLGizmoSimplify(m_parent, "cut.svg", 10));
+#if ENABLE_MEASURE_GIZMO
     m_gizmos.emplace_back(new GLGizmoMeasure(m_parent, "measure.svg", 11));
+#endif // ENABLE_MEASURE_GIZMO
 
     m_common_gizmos_data.reset(new CommonGizmosDataPool(&m_parent));