diff --git a/Sources/_StringProcessing/Algorithms/Algorithms/Split.swift b/Sources/_StringProcessing/Algorithms/Algorithms/Split.swift
index 97d8c80dd..f7bbfbd0c 100644
--- a/Sources/_StringProcessing/Algorithms/Algorithms/Split.swift
+++ b/Sources/_StringProcessing/Algorithms/Algorithms/Split.swift
@@ -75,6 +75,10 @@ extension SplitCollection: Sequence {
           : base[index...]
       }
       
+      if index == base.endIndex {
+        return finish()
+      }
+      
       if splitCounter >= maxSplits {
         return finish()
       }
diff --git a/Tests/RegexTests/AlgorithmsTests.swift b/Tests/RegexTests/AlgorithmsTests.swift
index 965e2c42e..d63333c01 100644
--- a/Tests/RegexTests/AlgorithmsTests.swift
+++ b/Tests/RegexTests/AlgorithmsTests.swift
@@ -128,14 +128,17 @@ class AlgorithmTests: XCTestCase {
       XCTAssertEqual(actual, expected, file: file, line: line)
     }
 
-    expectSplit("", "", ["", ""])
+    expectSplit("", "", [""])
     expectSplit("", "x", [""])
     expectSplit("a", "", ["", "a", ""])
     expectSplit("a", "x", ["a"])
     expectSplit("a", "a", ["", ""])
     expectSplit("a____a____a", "_+", ["a", "a", "a"])
     expectSplit("____a____a____a____", "_+", ["", "a", "a", "a", ""])
-    
+
+    XCTAssertEqual("".split(separator: ""), [])
+    XCTAssertEqual("".split(separator: "", omittingEmptySubsequences: false), [""])
+
     // Test that original `split` functions are still accessible
     let splitRef = "abcd".split
     XCTAssert(type(of: splitRef) == ((Character, Int, Bool) -> [Substring]).self)