diff --git a/next.config.js b/next.config.js
index fb69b9e7..83c9e4d8 100644
--- a/next.config.js
+++ b/next.config.js
@@ -15,7 +15,7 @@ const securityHeaders = [
       };` +
       `style-src 'self' fonts.googleapis.com 'unsafe-inline';` +
       `font-src fonts.gstatic.com;` +
-      `connect-src 'self' changi.ocean.jellyfishsdk.com blockscout-index.changi.dfi.team ${
+      `connect-src 'self' changi.ocean.jellyfishsdk.com changi.dfi.team ${
         process.env.NODE_ENV === "development"
           ? `ws://localhost:3000/_next/webpack-hmr base-goerli.blockscout.com eth-goerli.blockscout.com`
           : ""
diff --git a/src/pages/address/[aid].tsx b/src/pages/address/[aid].tsx
index 704b850a..1876466e 100644
--- a/src/pages/address/[aid].tsx
+++ b/src/pages/address/[aid].tsx
@@ -55,10 +55,10 @@ function getAddressType({
   switch (true) {
     case isTokenPage:
       return AddressType.Token;
-    case data.is_contract && data.token === null:
-      return AddressType.Contract;
-    case data.token !== null:
+    case data.is_contract && data.token !== null:
       return AddressType.TokenContract;
+    case data.is_contract:
+      return AddressType.Contract;
     default:
       return AddressType.Wallet;
   }