diff --git a/BeefLibs/corlib/src/String.bf b/BeefLibs/corlib/src/String.bf
index 358d0bd5..64fabff2 100644
--- a/BeefLibs/corlib/src/String.bf
+++ b/BeefLibs/corlib/src/String.bf
@@ -3053,7 +3053,7 @@ namespace System
 		{
 			get
 			{
-				return mMatchPos < mStrLen;
+				return mMatchPos < mStrLen && (!mSplitOptions.HasFlag(StringSplitOptions.RemoveEmptyEntries) || mStrLen != 0);
 			}
 		}
 
@@ -3216,7 +3216,7 @@ namespace System
 		{
 			get
 			{
-				return mMatchPos < mStrLen;
+				return mMatchPos < mStrLen && (!mSplitOptions.HasFlag(StringSplitOptions.RemoveEmptyEntries) || mStrLen != 0);
 			}
 		}