diff --git a/src/js/messaging.js b/src/js/messaging.js
index ebfc5c7d4..0142a1261 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -288,9 +288,8 @@ const getHostnameDict = function(hostnameDetailsMap, out) {
     const cnMap = [];
 
     const createDictEntry = (domain, hostname, details) => {
-        const cname = vAPI.net.canonicalNameFromHostname(hostname);
-        if ( cname !== undefined ) {
-            cnMap.push([ cname, hostname ]);
+        if ( details.cname ) {
+            cnMap.push([ details.cname, hostname ]);
         }
         hnDict[hostname] = { domain, counts: details.counts };
     };
diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index 227352d5d..d6f52b8cd 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -312,6 +312,7 @@ const HostnameDetails = class {
     }
     init(hostname) {
         this.hostname = hostname;
+        this.cname = vAPI.net.canonicalNameFromHostname(hostname);
         this.counts.reset();
     }
     dispose() {