diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 85b1c0149..44d748955 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -303,7 +303,7 @@ our $Options = {
     },
     'gap_fill_speed' => {
         label   => 'Gap fill',
-        tooltip => 'Speed for filling small gaps using short zigzag moves. Keep this reasonably low to avoid too much shaking and resonance issues.',
+        tooltip => 'Speed for filling small gaps using short zigzag moves. Keep this reasonably low to avoid too much shaking and resonance issues. Set zero to disable gaps filling.',
         sidetext => 'mm/s',
         cli     => 'gap-fill-speed=f',
         type    => 'f',
diff --git a/lib/Slic3r/Layer/Region.pm b/lib/Slic3r/Layer/Region.pm
index 4226f1b2e..18b039ce0 100644
--- a/lib/Slic3r/Layer/Region.pm
+++ b/lib/Slic3r/Layer/Region.pm
@@ -233,7 +233,7 @@ sub make_perimeters {
         }
         
         # fill gaps
-        {
+        if ($Slic3r::Config->gap_fill_speed > 0) {
             my $filler = Slic3r::Fill::Rectilinear->new(layer_id => $self->layer->id);
             
             my $w = $self->perimeter_flow->width;