diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index f8d9d4929..b08d4fc46 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -203,7 +203,7 @@ sub make_skirt {
     # checking whether we need to generate them
     $self->skirt->clear;
     
-    if ($self->config->skirts == 0
+    if (($self->config->skirts == 0 || $self->config->skirt_height == 0)
         && (!$self->config->ooze_prevention || @{$self->extruders} == 1)) {
         $self->set_step_done(STEP_SKIRT);
         return;
diff --git a/t/skirt_brim.t b/t/skirt_brim.t
index c7377abf8..878a78840 100644
--- a/t/skirt_brim.t
+++ b/t/skirt_brim.t
@@ -1,4 +1,4 @@
-use Test::More tests => 5;
+use Test::More tests => 6;
 use strict;
 use warnings;
 
@@ -79,6 +79,15 @@ use Slic3r::Test;
     ok Slic3r::Test::gcode($print), 'successful G-code generation when skirt is smaller than brim width';
 }
 
+{
+    my $config = Slic3r::Config->new_from_defaults;
+    $config->set('skirts', 1);
+    $config->set('skirt_height', 0);
+    
+    my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
+    ok Slic3r::Test::gcode($print), 'successful G-code generation when skirt_height = 0 and skirts > 0';
+}
+
 {
     my $config = Slic3r::Config->new_from_defaults;
     $config->set('layer_height', 0.4);