diff --git a/core/ustring.cpp b/core/ustring.cpp
index 389578caf6f..31147992b0b 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -2709,10 +2709,15 @@ int String::rfindn(const String &p_str, int p_from) const {
 
 bool String::ends_with(const String &p_string) const {
 
+	int l = p_string.length();
+	if (l == 0) {
+		return true;
+	}
+
 	int pos = find_last(p_string);
 	if (pos == -1)
 		return false;
-	return pos + p_string.length() == length();
+	return pos + l == length();
 }
 
 bool String::begins_with(const String &p_string) const {