diff --git a/src/komodo.h b/src/komodo.h
index e406e565a..2cf18d24e 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -832,6 +832,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
         for (i=0; i<txn_count; i++)
         {
             if ((is_STAKED(ASSETCHAINS_SYMBOL) != 0) && (STAKED_era(pindex->GetBlockTime()) == 0)) {
+                 printf("ERA 0 SKIP %s getblocktime: %d pindex->nTime : %d\n",pindex->GetBlockTime(),pindex->nTime,ASSETCHAINS_SYMBOL);
                 continue;
             }
             txhash = block.vtx[i].GetHash();
diff --git a/src/komodo_notary.h b/src/komodo_notary.h
index 4e40dc6e7..f9534ac18 100644
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -254,7 +254,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam
       }
     }
     else
-    { // here we can activate our pubkeys for STAKED chains by era.
+    { // here we can activate our pubkeys for STAKED chains everythig is in notaries_staked.cpp
         if (timestamp != 0)
         {
             int staked_era; int32_t numSN;
diff --git a/src/notaries_staked.cpp b/src/notaries_staked.cpp
index 18b8f8801..1bcc6ce93 100644
--- a/src/notaries_staked.cpp
+++ b/src/notaries_staked.cpp
@@ -118,22 +118,6 @@ int is_STAKED(const char *chain_name) {
   return(STAKED);
 };
 
-#ifdef SERVER
-int8_t updateStakedNotary() {
-    std::string notaryname;
-    char Raddress[18]; uint8_t pubkey33[33];
-    decode_hex(pubkey33,33,(char *)NOTARY_PUBKEY.c_str());
-    pubkey2addr((char *)Raddress,(uint8_t *)pubkey33);
-    NOTARY_ADDRESS.clear();
-    NOTARY_ADDRESS.assign(Raddress);
-    return(StakedNotaryID(notaryname,Raddress));
-}
-#else
-int8_t updateStakedNotary() {
-    return(-1);
-}
-#endif
-
 int STAKED_era(int timestamp)
 {
   int8_t era = 0;
@@ -170,6 +154,23 @@ int STAKED_era(int timestamp)
   return(era);
 };
 
+#ifdef SERVER
+int8_t updateStakedNotary() {
+    if ( NOTARY_ADDRESS.empty() ) {
+        std::string notaryname;
+        char Raddress[18]; uint8_t pubkey33[33];
+        decode_hex(pubkey33,33,(char *)NOTARY_PUBKEY.c_str());
+        pubkey2addr((char *)Raddress,(uint8_t *)pubkey33);
+        NOTARY_ADDRESS.assign(Raddress);
+    }
+    return(StakedNotaryID(notaryname,Raddress));
+}
+#else
+int8_t updateStakedNotary() {
+    return(-1);
+}
+#endif
+
 int8_t StakedNotaryID(std::string &notaryname, char *Raddress) {
   int8_t notaryID = -1;
     if ( STAKED_ERA != 0 ) {