diff --git a/core/shared/src/main/scala/fs2/Segment.scala b/core/shared/src/main/scala/fs2/Segment.scala
index b69235de83..7dcae5afe4 100644
--- a/core/shared/src/main/scala/fs2/Segment.scala
+++ b/core/shared/src/main/scala/fs2/Segment.scala
@@ -562,12 +562,17 @@ abstract class Segment[+O,+R] { self =>
         var staged: Step[O,R] = null
         staged = self.stage(depth.increment, defer,
           o => { if (rem > 0) { rem -= 1; emit(o) } else done(Right(staged.remainder.cons(o))) },
-          os => { if (os.size <= rem) { rem -= os.size; emits(os) }
-                  else {
+          os => os.size match {
+                  case sz if sz < rem =>
+                    rem -= os.size
+                    emits(os)
+                  case sz if sz == rem =>
+                    emits(os)
+                    done(Right(staged.remainder))
+                  case _ =>
                     var i = 0
                     while (rem > 0) { rem -= 1; emit(os(i)); i += 1 }
                     done(Right(staged.remainder.prepend(Segment.chunk(os.drop(i)))))
-                  }
                 },
           r => done(Left(r -> rem))
         ).value
diff --git a/core/shared/src/test/scala/fs2/SegmentSpec.scala b/core/shared/src/test/scala/fs2/SegmentSpec.scala
index 772705fb02..7fe2129b9e 100644
--- a/core/shared/src/test/scala/fs2/SegmentSpec.scala
+++ b/core/shared/src/test/scala/fs2/SegmentSpec.scala
@@ -181,7 +181,7 @@ class SegmentSpec extends Fs2Spec {
       forAll { (s: Segment[Int,Unit], n: Int) =>
         val v = s.force.toVector
         s.take(n).force.toVector shouldBe v.take(n)
-        if (n > 0 && n >= v.size) {
+        if (n > 0 && n > v.size) {
           s.take(n).drain.force.run shouldBe Left(((), n - v.size))
         } else {
           s.take(n).drain.force.run.map(_.force.toVector) shouldBe Right(Segment.vector(v.drop(n)).force.toVector)
@@ -189,6 +189,10 @@ class SegmentSpec extends Fs2Spec {
       }
     }
 
+    "take eagerly exits" in {
+      Segment.from(0L).filter(_ < 2L).take(2).force.toVector shouldBe Vector(0L, 1L)
+    }
+
     "takeWhile" in {
       forAll { (s: Segment[Int,Unit], f: Int => Boolean) =>
         s.takeWhile(f).force.toVector shouldBe s.force.toVector.takeWhile(f)