diff --git a/src/komodo.h b/src/komodo.h
index 8e84a6e02..207e38808 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -23,7 +23,7 @@
 // a. automate notarization fee payouts
 // b. automated distribution of test REVS snapshot
 
-//#define KOMODO_ASSETCHAINS_WAITNOTARIZE
+#define KOMODO_ASSETCHAINS_WAITNOTARIZE
 #define KOMODO_PAXMAX (10000 * COIN)
 
 #include <stdint.h>
diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index ea3481aae..b944f861e 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -476,7 +476,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to
     {
         {
 #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE
-            if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) // assumes same chain as notarize
+            if ( kmdsp != 0 && (kmdsp->NOTARIZED_HEIGHT >= pax->height || kmdsp->CURRENT_HEIGHT > pax->height+30) ) // assumes same chain as notarize
                 pax->validated = pax->komodoshis; //kmdsp->NOTARIZED_HEIGHT;
             else pax->validated = pax->ready = 0;
 #endif