diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 26dae4ee9c..7d9a453baf 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1594,6 +1594,10 @@ parse_page_control(
 			return EXIT_FAILURE;
 		}
 
+		if ( servercookie.bv_len == 0 ) {
+			morePagedResults = 0;
+		}
+
 		ldap_controls_free( ctrl );
 
 	} else {