diff --git a/range.c b/range.c
index e8a35c22cc..e4e73bd85d 100644
--- a/range.c
+++ b/range.c
@@ -2477,7 +2477,7 @@ range_overlap(VALUE range, VALUE other)
         /* if both begin values are equal, no more comparisons needed */
         if (rb_cmpint(cmp, self_beg, other_beg) == 0) return Qtrue;
     }
-    else if (NIL_P(self_beg) && NIL_P(other_beg)) {
+    else if (NIL_P(self_beg) && !NIL_P(self_end) && NIL_P(other_beg)) {
         VALUE cmp = rb_funcall(self_end, id_cmp, 1, other_end);
         return RBOOL(!NIL_P(cmp));
     }
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index 842be77ab3..e0c1d20bd2 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -1471,6 +1471,7 @@ class TestRange < Test::Unit::TestCase
     assert_operator((..3), :overlap?, (3..))
     assert_operator((nil..nil), :overlap?, (3..))
     assert_operator((nil...nil), :overlap?, (nil..))
+    assert_operator((nil..nil), :overlap?, (..3))
 
     assert_raise(TypeError) { (1..3).overlap?(1) }