diff --git a/src/Str.php b/src/Str.php
index <HASH>..<HASH> 100644
--- a/src/Str.php
+++ b/src/Str.php
@@ -568,6 +568,8 @@ final class Str implements \Countable {
 	 *
 	 * This operation is case-sensitive
 	 *
+	 * The empty string (as a search string) is not considered to be a part of any other string
+	 *
 	 * If the given search string is not found anywhere, an empty string is returned
 	 *
 	 * @param string $search the search string that should delimit the end
diff --git a/tests/index.php b/tests/index.php
index <HASH>..<HASH> 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -225,6 +225,7 @@ assert((string) $testStrObj->beforeFirst('d w☺rl') === 'Hello Hello w☺rl');
 assert((string) $testStrObj->beforeFirst('w☺rld') === 'Hello Hello ');
 assert((string) $testStrObj->beforeFirst('W☺rld') === '');
 assert((string) $testStrObj->beforeFirst('x') === '');
+assert((string) $testStrObj->beforeFirst('') === '');
 assert((string) $testStrObj->beforeLast('Hello') === 'Hello ');
 assert((string) $testStrObj->beforeLast('o H') === 'Hell');
 assert((string) $testStrObj->beforeLast('d w☺rl') === 'Hello Hello w☺rl');
Clarify existing behavior of 'beforeFirst' with empty needle