diff --git a/app/lib/computation/QuickSync.ts b/app/lib/computation/QuickSync.ts
index 038740eb783966a31dc57680471ba183c47e3afa..ccdeac10a1f5955744d21a5359557d069fe722e1 100644
--- a/app/lib/computation/QuickSync.ts
+++ b/app/lib/computation/QuickSync.ts
@@ -126,7 +126,7 @@ export class QuickSynchronizer {
 
         // Remember expiration dates
         for (const entry of index) {
-          if (entry.op === 'CREATE' && (entry.expires_on || entry.revokes_on)) {
+          if (entry.expires_on || entry.revokes_on) {
             sync_expires.push(entry.expires_on || entry.revokes_on);
           }
         }
diff --git a/app/modules/ws2p/lib/WS2PCluster.ts b/app/modules/ws2p/lib/WS2PCluster.ts
index 5e785d9ef63de9c95916252dbb770031d3deddfd..632f66002916ce15c530ccd02a0f78a4ca66fad2 100644
--- a/app/modules/ws2p/lib/WS2PCluster.ts
+++ b/app/modules/ws2p/lib/WS2PCluster.ts
@@ -372,7 +372,10 @@ export class WS2PCluster {
       const api = p.getWS2P(imCanReachTorEndpoint)
       if (api) {
         try {
-          await this.connectToRemoteWS(api.host, api.port, api.path, this.messageHandler, p.pubkey, api.uuid)
+          // We do not connect to local host
+          if (!this.server.conf.ws2p || api.uuid !== this.server.conf.ws2p.uuid) {
+            await this.connectToRemoteWS(api.host, api.port, api.path, this.messageHandler, p.pubkey, api.uuid)
+          }
         } catch (e) {
           this.server.logger.debug('WS2P: init: failed connection')
         }
diff --git a/doc/Protocol.md b/doc/Protocol.md
index 56d549a576c7c25decb5410af8b8e4dada3520ac..ee06c1e47835aeea09b05aa8ad2bb4c96e6d3938 100644
--- a/doc/Protocol.md
+++ b/doc/Protocol.md
@@ -2591,7 +2591,7 @@ If `reduce(GLOBAL_CINDEX[issuer=CERT.issuer,receiver=CERT.receiver,created_on=CE
 
 ###### BR_G93 - Membership expiry
 
-For each `REDUCE_BY(GLOBAL_MINDEX[expires_on<=HEAD.medianTime], 'pub') as POTENTIAL` then consider `REDUCE(GLOBAL_MINDEX[pub=POTENTIAL.pub]) AS MS`.
+For each `REDUCE_BY(GLOBAL_MINDEX[expires_on<=HEAD.medianTime AND revokes_on>HEAD.medianTime], 'pub') as POTENTIAL` then consider `REDUCE(GLOBAL_MINDEX[pub=POTENTIAL.pub]) AS MS`.
 
 If `MS.expired_on == null OR MS.expired_on == 0`, add a new LOCAL_MINDEX entry: