diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp
index ec88905b96e..46397f32de9 100644
--- a/src/libslic3r/LayerRegion.cpp
+++ b/src/libslic3r/LayerRegion.cpp
@@ -7,6 +7,7 @@
 #include "Surface.hpp"
 #include "BoundingBox.hpp"
 #include "SVG.hpp"
+#include "TextureMapping.hpp"
 #include "Algorithm/RegionExpansion.hpp"
 
 #include <string>
@@ -17,6 +18,16 @@
 
 namespace Slic3r {
 
+static bool region_uses_overhang_texture_mapping(const Print &print, const PrintRegionConfig &region_config)
+{
+    const int filament_id = region_config.wall_filament.value;
+    if (filament_id <= 0)
+        return false;
+
+    const TextureMappingZone *zone = print.texture_mapping_manager().zone_from_id(unsigned(filament_id));
+    return zone != nullptr && zone->enabled && !zone->deleted && (zone->is_2d_gradient() || zone->is_image_texture());
+}
+
 Flow LayerRegion::flow(FlowRole role) const
 {
     return this->flow(role, m_layer->height);
@@ -117,7 +128,9 @@ void LayerRegion::make_perimeters(const SurfaceCollection &slices, const LayerRe
     g.overhang_flow         = this->bridging_flow(frPerimeter, object_config.thick_bridges);
     g.solid_infill_flow     = this->flow(frSolidInfill);
 
-    if (this->layer()->object()->config().wall_generator.value == PerimeterGeneratorType::Arachne && !spiral_mode)
+    const bool force_classic_wall_generator = region_uses_overhang_texture_mapping(*this->layer()->object()->print(), region_config);
+    if (this->layer()->object()->config().wall_generator.value == PerimeterGeneratorType::Arachne && !spiral_mode &&
+        !force_classic_wall_generator)
         g.process_arachne();
     else
         g.process_classic();
diff --git a/src/libslic3r/PrintRegion.cpp b/src/libslic3r/PrintRegion.cpp
index 3dac848218a..7e8bef2dbd9 100644
--- a/src/libslic3r/PrintRegion.cpp
+++ b/src/libslic3r/PrintRegion.cpp
@@ -16,7 +16,7 @@ static bool filament_id_uses_texture_mapping(const Print &print, unsigned int fi
         return false;
 
     const TextureMappingZone *zone = print.texture_mapping_manager().zone_from_id(filament_id);
-    return zone != nullptr && zone->enabled && !zone->deleted && zone->is_image_texture();
+    return zone != nullptr && zone->enabled && !zone->deleted && (zone->is_2d_gradient() || zone->is_image_texture());
 }
 
 static void append_used_physical_extruders_for_filament_id(const Print                  &print,