diff --git a/servers/slapd/back-mdb/id2entry.c b/servers/slapd/back-mdb/id2entry.c
index fe1f882732..d69e6a52aa 100644
--- a/servers/slapd/back-mdb/id2entry.c
+++ b/servers/slapd/back-mdb/id2entry.c
@@ -407,7 +407,12 @@ int mdb_id2entry_delete(
 		rc = mdb_cursor_del( mvc, MDB_NODUPDATA );
 		if (rc)
 			return rc;
-		mdb_cursor_get( mvc, &key, NULL, MDB_GET_CURRENT );
+		rc = mdb_cursor_get( mvc, &key, NULL, MDB_GET_CURRENT );
+		if (rc) {
+			if (rc == MDB_NOTFOUND)
+				rc = MDB_SUCCESS;
+			break;
+		}
 	}
 	return rc;
 }