diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 2f207934e7..73b2fbbad9 100644
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -1346,6 +1346,10 @@ int slapi_search_internal_callback_pb( Slapi_PBlock *pb,
 
 cleanup:
 	slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
+	slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK, NULL );
+	slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, NULL );
+	slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, NULL );
+	slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA, NULL );
 
 	if ( freeFilter && filter != NULL )
 		slapi_filter_free( filter, 1 );
diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 5453dee727..dd1bf03241 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1578,7 +1578,7 @@ slapi_send_ldap_result(
 		return;
 	}
 
-	if (op->o_tag == LDAP_REQ_SEARCH)
+	if ( op->o_tag == LDAP_REQ_SEARCH )
 		rs.sr_nentries = nentries;
 
 	send_ldap_result( op, &rs );