diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index be8bba53e9..d28908295b 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -149,7 +149,7 @@ do_extended(
 	refs = NULL;
 
 	rc = (ext->ext_main)( conn, op,
-		reqoid, reqdata,
+		reqoid, reqdata->bv_val ? reqdata : NULL,
 		&rspoid, &rspdata, &rspctrls, &text, &refs );
 
 	if( rc != SLAPD_ABANDON ) {