diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 61fa9ac1e4..60e10e5024 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -296,12 +296,12 @@ done2:;
 			send_ldap_result( op, rs );
 		}
 
-		if ( op->oq_extended.rs_reqoid.bv_val != NULL ) {
-			slapi_ch_free( (void **)&op->oq_extended.rs_reqoid.bv_val );
+		if ( rs->sr_rspoid != NULL ) {
+			ch_free( (char *)rs->sr_rspoid );
 		}
 
-		if ( op->oq_extended.rs_reqdata != NULL ) {
-			ber_bvfree( op->oq_extended.rs_reqdata );
+		if ( rs->sr_rspdata != NULL ) {
+			ber_bvfree( rs->sr_rspdata );
 		}
 
 	} /* end of Netscape extended operation */
diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 50b2db21d4..d5b768a61b 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1376,7 +1376,7 @@ slapi_send_ldap_result(
 		rs.sr_type = REP_EXTENDED;
 		rs.sr_rspoid = extOID;
 		slapi_pblock_get( pb, SLAPI_EXT_OP_RET_VALUE, &rs.sr_rspdata );
-		send_ldap_extended_response( op, &rs );
+		send_ldap_extended( op, &rs );
 		return;
 	}