diff --git a/src/modules/[chain]/cosmwasm/WasmClient.ts b/src/modules/[chain]/cosmwasm/WasmClient.ts
index 1b9865b0..9b292856 100644
--- a/src/modules/[chain]/cosmwasm/WasmClient.ts
+++ b/src/modules/[chain]/cosmwasm/WasmClient.ts
@@ -120,9 +120,7 @@ export class WasmRestClient extends BaseRestClient<WasmRequestRegistry> {
       };
     }
 
-    if (blockchain.chainName === 'osmosis') {
-      page?.setCountTotal(false);
-    }
+    page?.setCountTotal(false);
 
     const res = await this.queryClient.extra.listCode(page);
     return res;
diff --git a/src/stores/useBaseStore.ts b/src/stores/useBaseStore.ts
index 5e4d163b..5a6ff08f 100644
--- a/src/stores/useBaseStore.ts
+++ b/src/stores/useBaseStore.ts
@@ -107,10 +107,10 @@ export const useBaseStore = defineStore('baseStore', {
       }
       //check if the block exists in recents
       if (
-        this.recents.findIndex(
-          (x) =>
-            toBase64(x?.blockId?.hash) === toBase64(this.latest?.blockId?.hash)
-        ) === -1
+        this.latest?.blockId?.hash &&
+        this.recents.some(
+          (x) => toBase64(x.blockId.hash) === toBase64(this.latest.blockId.hash)
+        )
       ) {
         if (this.recents.length >= 50) {
           this.recents.shift();