diff --git a/include/mapnik/renderer_common/process_markers_symbolizer.hpp b/include/mapnik/renderer_common/process_markers_symbolizer.hpp
index 9d0852675..16e18ecf2 100644
--- a/include/mapnik/renderer_common/process_markers_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_markers_symbolizer.hpp
@@ -118,9 +118,9 @@ struct render_marker_symbolizer_visitor
             if (clip) // optional clip (default: true)
             {
                 geometry::geometry_types type = geometry::geometry_type(feature_.get_geometry());
-                if (type == geometry::geometry_types::Polygon)
+                if (type == geometry::geometry_types::Polygon || type == geometry::geometry_types::MultiPolygon)
                     converter.template set<clip_poly_tag>();
-                else if (type == geometry::geometry_types::LineString)
+                else if (type == geometry::geometry_types::LineString || type == geometry::geometry_types::MultiLineString)
                     converter.template set<clip_line_tag>();
             }
 
@@ -223,9 +223,9 @@ struct render_marker_symbolizer_visitor
         if (clip) // optional clip (default: true)
         {
             geometry::geometry_types type = geometry::geometry_type(feature_.get_geometry());
-            if (type == geometry::geometry_types::Polygon)
+            if (type == geometry::geometry_types::Polygon || type == geometry::geometry_types::MultiPolygon)
                 converter.template set<clip_poly_tag>();
-            else if (type == geometry::geometry_types::LineString)
+            else if (type == geometry::geometry_types::LineString || type == geometry::geometry_types::MultiLineString)
                 converter.template set<clip_line_tag>();
         }
         converter.template set<transform_tag>(); //always transform