diff --git a/app/lib/indexer.ts b/app/lib/indexer.ts
index 2ceced445e9e1b707d5a3962308545b47a7852e0..9ec4f90e5d167ddddf4ea710c3015a29c8b2673f 100644
--- a/app/lib/indexer.ts
+++ b/app/lib/indexer.ts
@@ -671,10 +671,12 @@ export class Indexer {
     // BR_G107
     if (HEAD.number > 0) {
       await Promise.all(mindex.map(async (ENTRY: MindexEntry) => {
-        const rows = await dal.mindexDAL.sqlFind({ pub: ENTRY.pub, chainable_on: { $gt: HEAD_1.medianTime }});
-        // This rule will be enabled on
-        if (HEAD.medianTime >= 1498860000) {
-          ENTRY.unchainables = count(rows);
+        if (ENTRY.revocation === null) {
+          const rows = await dal.mindexDAL.sqlFind({ pub: ENTRY.pub, chainable_on: { $gt: HEAD_1.medianTime }});
+          // This rule will be enabled on
+          if (HEAD.medianTime >= 1498860000) {
+            ENTRY.unchainables = count(rows);
+          }
         }
       }))
     }
diff --git a/doc/Protocol.md b/doc/Protocol.md
index 612afb4eaecdcc9cf51de022336c70c284dcd48f..56d549a576c7c25decb5410af8b8e4dada3520ac 100644
--- a/doc/Protocol.md
+++ b/doc/Protocol.md
@@ -2094,8 +2094,8 @@ For each ENTRY in local MINDEX where `revoked_on != null`:
     ENTRY.isBeingRevoked = true
    
 ####### BR_G107 - ENTRY.unchainables
-F
-If `HEAD.number > 0`:
+
+If `HEAD.number > 0 AND ENTRY.revocation == null`:
 
     ENTRY.unchainables = COUNT(GLOBAL_MINDEX[issuer=ENTRY.issuer, chainable_on > HEAD~1.medianTime]))