diff --git a/CHANGES b/CHANGES
index 11489928dfadccba397e163b63665fbdb53b8124..b73a489b3b5390b16d772f53bc5f05d1eddfce0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -102,6 +102,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
 	Fixed slapo-pcache pointer freeing (ITS#6797)
 	Fixed slapo-pcache with negative caching (ITS#6796)
+	Fixed slapo-pcache monitoring cleanup (ITS#6808)
 	Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
 	Fixed slapo-ppolicy to allow userPassword deletion (ITS#6620)
 	Fixed slapo-refint when last group member is deleted (ITS#6663)
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 68c324d86d3e21f958bb498de1d56c2834d2b104..64de6a43dddd39c177d7ba3cf53b6810a29aa6bf 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -5523,7 +5523,7 @@ pcache_monitor_db_close( BackendDB *be )
 
 		if ( mi && &mi->bi_extra ) {
 			mbe = mi->bi_extra;
-			mbe->unregister_entry_callback( NULL,
+			mbe->unregister_entry_callback( &cm->monitor_ndn,
 				(monitor_callback_t *)cm->monitor_cb,
 				NULL, 0, NULL );
 		}