diff --git a/src/komodo_notary.h b/src/komodo_notary.h
index a87325d84..fb7a8f426 100644
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -200,12 +200,8 @@ const char *Notaries_elected1[][2] =
 int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp)
 {
     int32_t i,htind,n; uint64_t mask = 0; struct knotary_entry *kp,*tmp;
-    if ( timestamp == 0 )
-    {
-        CBlockIndex *pblockindex = chainActive[height];
-        if ( pblockindex != 0 )
-            timestamp = pblockindex->GetBlockTime();
-    }
+    if ( timestamp == 0 && (timestamp= komodo_heightstamp(height)) == 0 )
+        timestamp = (uint32_t)time(NULL) - 777;
     if ( height >= KOMODO_NOTARIES_HARDCODED || ASSETCHAINS_SYMBOL[0] != 0 )
     {
         if ( timestamp < KOMODO_NOTARIES_TIMESTAMP1 || height < KOMODO_NOTARIES_HEIGHT1 )