diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index ddb878a7d2..9b892eb53f 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1289,6 +1289,7 @@ void ObjectManipulation::set_uniform_scaling(const bool use_uniform_scale)
     const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection();
 #if ENABLE_WORLD_COORDINATE_SCALE_REVISITED
     if (!use_uniform_scale) {
+#if !ENABLE_TRANSFORMATIONS_BY_MATRICES
         int res = selection.bake_transform_if_needed();
         if (res == -1) {
             // Enforce uniform scaling.
@@ -1296,6 +1297,7 @@ void ObjectManipulation::set_uniform_scaling(const bool use_uniform_scale)
             return;
         }
         else if (res == 0)
+#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES
             // Recalculate cached values at this panel, refresh the screen.
             this->UpdateAndShow(true);
     }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index d024902a74..1ce4976113 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -75,6 +75,7 @@ bool GLGizmoScale3D::on_mouse(const wxMouseEvent &mouse_event)
 {
     if (mouse_event.Dragging()) {
         if (m_dragging) {
+#if !ENABLE_TRANSFORMATIONS_BY_MATRICES
 #if ENABLE_WORLD_COORDINATE_SCALE_REVISITED
             int res = 1;
             if (m_scale.x() != m_scale.y() || m_scale.x() != m_scale.z())
@@ -86,6 +87,7 @@ bool GLGizmoScale3D::on_mouse(const wxMouseEvent &mouse_event)
             }
             else {
 #endif // ENABLE_WORLD_COORDINATE_SCALE_REVISITED
+#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES
             // Apply new temporary scale factors
 #if ENABLE_WORLD_COORDINATE
                 TransformationType transformation_type;
@@ -103,10 +105,12 @@ bool GLGizmoScale3D::on_mouse(const wxMouseEvent &mouse_event)
 #else
                 if (mouse_event.CmdDown()) selection.translate(m_offset, true);
 #endif // ENABLE_WORLD_COORDINATE
+#if !ENABLE_TRANSFORMATIONS_BY_MATRICES
 #if ENABLE_WORLD_COORDINATE_SCALE_REVISITED
             }
 #endif // ENABLE_WORLD_COORDINATE_SCALE_REVISITED
-        }
+#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES
+    }
     }
     return use_grabbers(mouse_event);
 }