diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index bdb90f8addb..3b952865c5b 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2837,7 +2837,7 @@ static zend_string* php_ldap_do_escape(const zend_bool *map, const char *value,
 	if (flags & PHP_LDAP_ESCAPE_DN && value[0] == ' ') {
 		len += 2;
 	}
-	if (flags & PHP_LDAP_ESCAPE_DN && valuelen && value[valuelen - 1] == ' ') {
+	if (flags & PHP_LDAP_ESCAPE_DN && valuelen > 1 && value[valuelen - 1] == ' ') {
 		len += 2;
 	}