diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index b089ce1f9f..52c9e10d3c 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -26,6 +26,8 @@
 #define ENABLE_GCODE_VIEWER_DATA_CHECKING 0
 // Enable project dirty state manager debug window
 #define ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW 0
+// Disable using instanced models to render options in gcode preview
+#define DISABLE_GCODEVIEWER_INSTANCED_MODELS 1
 
 
 // Enable rendering of objects using environment map
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 5eea58a0fe..367846f0c8 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -584,14 +584,16 @@ void GCodeViewer::init()
         case EMoveType::Retract:
         case EMoveType::Unretract:
         case EMoveType::Seam: {
-//            if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
-//                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
-//                buffer.shader = "gouraud_light_instanced";
-//                buffer.model.model.init_from(diamond(16));
-//                buffer.model.color = option_color(type);
-//                buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
-//            }
-//            else {
+#if !DISABLE_GCODEVIEWER_INSTANCED_MODELS
+            if (wxGetApp().is_gl_version_greater_or_equal_to(3, 3)) {
+                buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::InstancedModel;
+                buffer.shader = "gouraud_light_instanced";
+                buffer.model.model.init_from(diamond(16));
+                buffer.model.color = option_color(type);
+                buffer.model.instances.format = InstanceVBuffer::EFormat::InstancedModel;
+            }
+            else {
+#endif // !DISABLE_GCODEVIEWER_INSTANCED_MODELS
                 buffer.render_primitive_type = TBuffer::ERenderPrimitiveType::BatchedModel;
                 buffer.vertices.format = VBuffer::EFormat::PositionNormal3;
                 buffer.shader = "gouraud_light";
@@ -599,8 +601,10 @@ void GCodeViewer::init()
                 buffer.model.data = diamond(16);
                 buffer.model.color = option_color(type);
                 buffer.model.instances.format = InstanceVBuffer::EFormat::BatchedModel;
-//            }
-            break;
+#if !DISABLE_GCODEVIEWER_INSTANCED_MODELS
+            }
+#endif // !DISABLE_GCODEVIEWER_INSTANCED_MODELS
+                break;
         }
         case EMoveType::Wipe:
         case EMoveType::Extrude: {