diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp
index b64862f60e..2975c2c3fb 100644
--- a/src/libslic3r/Support/SupportMaterial.cpp
+++ b/src/libslic3r/Support/SupportMaterial.cpp
@@ -677,7 +677,9 @@ public:
         m_extrusion_width(params.extrusion_width),
         m_support_material_closing_radius(params.support_closing_radius)
     {
-        if (m_style != smsSnug) m_style = smsGrid;
+        if (m_style == smsDefault) m_style = smsGrid;
+        if (std::set<SupportMaterialStyle>{smsTreeSlim, smsTreeStrong, smsTreeHybrid, smsOrganic}.count(m_style))
+            m_style = smsGrid;
         switch (m_style) {
         case smsGrid:
         {
@@ -769,6 +771,13 @@ public:
         )
     {
         switch (m_style) {
+        case smsTreeSlim:
+        case smsTreeStrong:
+        case smsTreeHybrid:
+        case smsOrganic:
+            assert(false);
+            //[[fallthrough]];
+            return Polygons();
         case smsGrid:
         {
     #ifdef SUPPORT_USE_AGG_RASTERIZER