diff --git a/t/retraction.t b/t/retraction.t
index 05370e672..2e4b177f5 100644
--- a/t/retraction.t
+++ b/t/retraction.t
@@ -1,4 +1,4 @@
-use Test::More tests => 21;
+use Test::More tests => 22;
 use strict;
 use warnings;
 
@@ -205,20 +205,29 @@ use Slic3r::Test qw(_eq);
     my $config = Slic3r::Config->new_from_defaults;
     $config->set('start_gcode', '');
     $config->set('retract_lift', [3]);
+    
+    my @lifted_at = ();
+    my $test = sub {
+        my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
+        @lifted_at = ();
+        Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
+            my ($self, $cmd, $args, $info) = @_;
+        
+            if ($cmd eq 'G1' && $info->{dist_Z} < 0) {
+                push @lifted_at, $info->{new_Z};
+            }
+        });
+    };
+    
+    $config->set('retract_lift_above', [0]);
+    $config->set('retract_lift_below', [0]);
+    $test->();
+    ok !!@lifted_at, 'lift takes place when above/below == 0';
+    
     $config->set('retract_lift_above', [5]);
     $config->set('retract_lift_below', [15]);
-    
-    my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
-    my @lifted_at = ();
-    Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
-        my ($self, $cmd, $args, $info) = @_;
-        
-        if ($cmd eq 'G1' && $info->{dist_Z} < 0) {
-            push @lifted_at, $info->{new_Z};
-        }
-    });
-    
-    ok !!@lifted_at, 'lift takes place';
+    $test->();
+    ok !!@lifted_at, 'lift takes place when above/below != 0';
     ok !(any { $_ < $config->get_at('retract_lift_above', 0) } @lifted_at),
         'Z is not lifted below the configured value';
     ok !(any { $_ > $config->get_at('retract_lift_below', 0) } @lifted_at),
diff --git a/xs/src/libslic3r/GCodeWriter.cpp b/xs/src/libslic3r/GCodeWriter.cpp
index 3ec301d70..d932fd83f 100644
--- a/xs/src/libslic3r/GCodeWriter.cpp
+++ b/xs/src/libslic3r/GCodeWriter.cpp
@@ -500,7 +500,7 @@ GCodeWriter::lift()
     {
         double above = this->config.retract_lift_above.get_at(0);
         double below = this->config.retract_lift_below.get_at(0);
-        if (this->_pos.z >= above && this->_pos.z <= below && below > 0)
+        if (this->_pos.z >= above && (below == 0 || this->_pos.z <= below))
             target_lift = this->config.retract_lift.get_at(0);
     }
     if (this->_lifted == 0 && target_lift > 0) {