diff --git a/lib/request.js b/lib/request.js
index 904611f0..35545006 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -68,13 +68,13 @@ export async function getCountry(req, ip) {
 
   lookup.close();
 
-  return result.country.iso_code;
+  return result?.country?.iso_code;
 }
 
 export async function getClientInfo(req, { screen }) {
+  const userAgent = req.headers['user-agent'];
   const ip = getIpAddress(req);
   const country = await getCountry(req, ip);
-  const userAgent = req.headers['user-agent'];
   const browser = browserName(userAgent);
   const os = detectOS(userAgent);
   const device = getDevice(screen, browser, os);
diff --git a/lib/session.js b/lib/session.js
index 9e57652a..ef9f403f 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -1,6 +1,6 @@
 import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
 import { getClientInfo } from 'lib/request';
-import { uuid, isValidId, parseToken } from 'lib/crypto';
+import { uuid, isValidId } from 'lib/crypto';
 
 export async function verifySession(req) {
   const { payload } = req.body;
@@ -9,50 +9,42 @@ export async function verifySession(req) {
     throw new Error('Invalid request');
   }
 
-  const { website: website_uuid, hostname, screen, language, session } = payload;
+  const { website: website_uuid, hostname, screen, language } = payload;
 
   if (!isValidId(website_uuid)) {
     throw new Error(`Invalid website: ${website_uuid}`);
   }
 
-  const token = await parseToken(session);
+  const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
 
-  if (!token || token.website_uuid !== website_uuid) {
-    const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
+  const website = await getWebsiteByUuid(website_uuid);
 
-    const website = await getWebsiteByUuid(website_uuid);
-
-    if (!website) {
-      throw new Error(`Website not found: ${website_uuid}`);
-    }
-
-    const { website_id } = website;
-    const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
-
-    let session = await getSessionByUuid(session_uuid);
-
-    if (!session) {
-      session = await createSession(website_id, {
-        session_uuid,
-        hostname,
-        browser,
-        os,
-        screen,
-        language,
-        country,
-        device,
-      });
-    }
-
-    const { session_id } = session;
-
-    return {
-      website_id,
-      website_uuid,
-      session_id,
-      session_uuid,
-    };
+  if (!website) {
+    throw new Error(`Website not found: ${website_uuid}`);
   }
 
-  return token;
+  const { website_id } = website;
+  const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
+
+  let session = await getSessionByUuid(session_uuid);
+
+  if (!session) {
+    session = await createSession(website_id, {
+      session_uuid,
+      hostname,
+      browser,
+      os,
+      screen,
+      language,
+      country,
+      device,
+    });
+  }
+
+  const { session_id } = session;
+
+  return {
+    website_id,
+    session_id,
+  };
 }
diff --git a/package.json b/package.json
index 32369d71..5f7be4d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.10.4",
+  "version": "0.11.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
diff --git a/pages/api/collect.js b/pages/api/collect.js
index 07e513d4..56d2ea79 100644
--- a/pages/api/collect.js
+++ b/pages/api/collect.js
@@ -1,16 +1,15 @@
 import { savePageView, saveEvent } from 'lib/queries';
 import { useCors, useSession } from 'lib/middleware';
-import { createToken } from 'lib/crypto';
 import { ok, badRequest } from 'lib/response';
 
 export default async (req, res) => {
   await useCors(req, res);
   await useSession(req, res);
 
-  const { session } = req;
-  const token = await createToken(session);
-  const { website_id, session_id } = session;
   const { type, payload } = req.body;
+  const {
+    session: { website_id, session_id },
+  } = req;
 
   if (type === 'pageview') {
     const { url, referrer } = payload;
@@ -24,5 +23,5 @@ export default async (req, res) => {
     return badRequest(res);
   }
 
-  return ok(res, { session: token });
+  return ok(res);
 };
diff --git a/public/umami.js b/public/umami.js
index 7b2fb336..64a68198 100644
--- a/public/umami.js
+++ b/public/umami.js
@@ -1 +1 @@
-!function(){"use strict";function e(e){var t=this.constructor;return this.then((function(n){return t.resolve(e()).then((function(){return n}))}),(function(n){return t.resolve(e()).then((function(){return t.reject(n)}))}))}var t=setTimeout;function n(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function i(e,t){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var n=1===e._state?t.onFulfilled:t.onRejected;if(null!==n){var r;try{r=n(e._value)}catch(e){return void s(t.promise,e)}u(t.promise,r)}else(1===e._state?u:s)(t.promise,e._value)}))):e._deferreds.push(t)}function u(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof o)return e._state=3,e._value=t,void a(e);if("function"==typeof n)return void f((r=n,i=t,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=t,a(e)}catch(t){s(e,t)}var r,i}function s(e,t){e._state=2,e._value=t,a(e)}function a(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var t=0,n=e._deferreds.length;t<n;t++)i(e,e._deferreds[t]);e._deferreds=null}function c(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1;try{e((function(e){n||(n=!0,u(t,e))}),(function(e){n||(n=!0,s(t,e))}))}catch(e){if(n)return;n=!0,s(t,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,t){var n=new this.constructor(r);return i(this,new c(e,t,n)),n},o.prototype["finally"]=e,o.all=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return t([]);var i=o.length;function u(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var s=n.then;if("function"==typeof s)return void s.call(n,(function(t){u(e,t)}),r)}o[e]=n,0==--i&&t(o)}catch(e){r(e)}}for(var s=0;s<o.length;s++)u(s,o[s])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(t){t(e)}))},o.reject=function(e){return new o((function(t,n){n(e)}))},o.race=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.race accepts an array"));for(var i=0,u=e.length;i<u;i++)o.resolve(e[i]).then(t,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){t(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l["Promise"]=o,self.fetch||(self.fetch=function(e,t){return t=t||{},new Promise((function(n,r){var o=new XMLHttpRequest,i=[],u=[],s={},a=function(){return{ok:2==(o.status/100|0),statusText:o.statusText,status:o.status,url:o.responseURL,text:function(){return Promise.resolve(o.responseText)},json:function(){return Promise.resolve(JSON.parse(o.responseText))},blob:function(){return Promise.resolve(new Blob([o.response]))},clone:a,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase()in s}}}};for(var c in o.open(t.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,t,n){i.push(t=t.toLowerCase()),u.push([t,n]),s[t]=s[t]?s[t]+","+n:n})),n(a())},o.onerror=r,o.withCredentials="include"==t.credentials,t.headers)o.setRequestHeader(c,t.headers[c]);o.send(t.body||null)}))});var h=function(e,t){return function(e,t,n){return fetch(t,{method:e,cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:n}).then((function(t){return t.ok?t.json():["post","put","delete"].includes(e)?t.text():null}))}("post",e,JSON.stringify(t))},p=function(e,t,n){var r=e[t];return function(){for(var t=[],o=arguments.length;o--;)t[o]=arguments[o];return n.apply(null,t),r.apply(e,t)}};!function(e,t){var n=e.screen,r=n.width,o=n.height,i=e.navigator.language,u=e.location,s=u.hostname,a=u.pathname,c=u.search,f=e.localStorage,l=e.document,d=e.history,v=l.querySelector("script[data-website-id]"),y=v&&v.getAttribute("data-website-id"),m=new URL(v.src).origin,w=r+"x"+o,_=[],g=""+a+c,b=l.referrer,j=function(e,n){var r={session:f.getItem(t),url:g,referrer:b,website:y,hostname:s,screen:w,language:i};return n&&Object.keys(n).forEach((function(e){r[e]=n[e]})),h(m+"/api/collect",{type:e,payload:r}).then((function(e){var n=e.session;return n&&f.setItem(t,n)}))},P=function(){return j("pageview").then((function(){return setTimeout(S,300)}))},E=function(e,t,n){T(),b=g,g=n,P()};d.pushState=p(d,"pushState",E),d.replaceState=p(d,"replaceState",E);var T=function(){_.forEach((function(e){var t=e[0],n=e[1],r=e[2];t&&t.removeEventListener(n,r,!0)})),_.length=0},S=function(){l.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(t){if(/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(t)){var n=t.split("--"),r=n[1],o=n[2],i=function(){return j("event",{event_type:r,event_value:o})};_.push([e,r,i]),e.addEventListener(r,i,!0)}}))}))};P()}(window,"umami.session")}();
+!function(){"use strict";function e(e){var t=this.constructor;return this.then((function(n){return t.resolve(e()).then((function(){return n}))}),(function(n){return t.resolve(e()).then((function(){return t.reject(n)}))}))}var t=setTimeout;function n(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function i(e,t){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var n=1===e._state?t.onFulfilled:t.onRejected;if(null!==n){var r;try{r=n(e._value)}catch(e){return void a(t.promise,e)}u(t.promise,r)}else(1===e._state?u:a)(t.promise,e._value)}))):e._deferreds.push(t)}function u(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof o)return e._state=3,e._value=t,void c(e);if("function"==typeof n)return void f((r=n,i=t,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=t,c(e)}catch(t){a(e,t)}var r,i}function a(e,t){e._state=2,e._value=t,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var t=0,n=e._deferreds.length;t<n;t++)i(e,e._deferreds[t]);e._deferreds=null}function s(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1;try{e((function(e){n||(n=!0,u(t,e))}),(function(e){n||(n=!0,a(t,e))}))}catch(e){if(n)return;n=!0,a(t,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,t){var n=new this.constructor(r);return i(this,new s(e,t,n)),n},o.prototype["finally"]=e,o.all=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return t([]);var i=o.length;function u(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var a=n.then;if("function"==typeof a)return void a.call(n,(function(t){u(e,t)}),r)}o[e]=n,0==--i&&t(o)}catch(e){r(e)}}for(var a=0;a<o.length;a++)u(a,o[a])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(t){t(e)}))},o.reject=function(e){return new o((function(t,n){n(e)}))},o.race=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.race accepts an array"));for(var i=0,u=e.length;i<u;i++)o.resolve(e[i]).then(t,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){t(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l["Promise"]=o,self.fetch||(self.fetch=function(e,t){return t=t||{},new Promise((function(n,r){var o=new XMLHttpRequest,i=[],u=[],a={},c=function(){return{ok:2==(o.status/100|0),statusText:o.statusText,status:o.status,url:o.responseURL,text:function(){return Promise.resolve(o.responseText)},json:function(){return Promise.resolve(JSON.parse(o.responseText))},blob:function(){return Promise.resolve(new Blob([o.response]))},clone:c,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return a[e.toLowerCase()]},has:function(e){return e.toLowerCase()in a}}}};for(var s in o.open(t.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,t,n){i.push(t=t.toLowerCase()),u.push([t,n]),a[t]=a[t]?a[t]+","+n:n})),n(c())},o.onerror=r,o.withCredentials="include"==t.credentials,t.headers)o.setRequestHeader(s,t.headers[s]);o.send(t.body||null)}))});var h=function(e,t){return function(e,t,n){return fetch(t,{method:e,cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:n}).then((function(t){return t.ok?t.json():["post","put","delete"].includes(e)?t.text():null}))}("post",e,JSON.stringify(t))},p=function(e,t,n){var r=e[t];return function(){for(var t=[],o=arguments.length;o--;)t[o]=arguments[o];return n.apply(null,t),r.apply(e,t)}};!function(e){var t=e.screen,n=t.width,r=t.height,o=e.navigator.language,i=e.location,u=i.hostname,a=i.pathname,c=i.search,s=e.document,f=e.history,l=s.querySelector("script[data-website-id]");if(l){var d=l.getAttribute("data-website-id"),v=new URL(l.src).origin,y=n+"x"+r,m=[],w=""+a+c,_=s.referrer,g=function(e,t){var n={url:w,referrer:_,website:d,hostname:u,screen:y,language:o};return t&&Object.keys(t).forEach((function(e){n[e]=t[e]})),h(v+"/api/collect",{type:e,payload:n})},b=function(){return g("pageview").then((function(){return setTimeout(E,300)}))},j=function(e,t,n){P(),_=w,w=n,b()};f.pushState=p(f,"pushState",j),f.replaceState=p(f,"replaceState",j);var P=function(){m.forEach((function(e){var t=e[0],n=e[1],r=e[2];t&&t.removeEventListener(n,r,!0)})),m.length=0},E=function(){s.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(t){if(/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(t)){var n=t.split("--"),r=n[1],o=n[2],i=function(){return g("event",{event_type:r,event_value:o})};m.push([e,r,i]),e.addEventListener(r,i,!0)}}))}))};b()}}(window)}();
diff --git a/tracker/index.js b/tracker/index.js
index 4637150f..4449b9c9 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -2,18 +2,20 @@ import 'promise-polyfill/src/polyfill';
 import 'unfetch/polyfill';
 import { post, hook } from '../lib/web';
 
-((window, sessionKey) => {
+(window => {
   const {
     screen: { width, height },
     navigator: { language },
     location: { hostname, pathname, search },
-    localStorage: store,
     document,
     history,
   } = window;
 
   const script = document.querySelector('script[data-website-id]');
-  const website = script && script.getAttribute('data-website-id');
+
+  if (!script) return;
+
+  const website = script.getAttribute('data-website-id');
   const hostUrl = new URL(script.src).origin;
   const screen = `${width}x${height}`;
   const listeners = [];
@@ -21,9 +23,10 @@ import { post, hook } from '../lib/web';
   let currentUrl = `${pathname}${search}`;
   let currentRef = document.referrer;
 
+  /* Collect metrics */
+
   const collect = (type, params) => {
     const payload = {
-      session: store.getItem(sessionKey),
       url: currentUrl,
       referrer: currentRef,
       website,
@@ -41,7 +44,7 @@ import { post, hook } from '../lib/web';
     return post(`${hostUrl}/api/collect`, {
       type,
       payload,
-    }).then(({ session }) => session && store.setItem(sessionKey, session));
+    });
   };
 
   const pageView = () => collect('pageview').then(() => setTimeout(loadEvents, 300));
@@ -86,4 +89,4 @@ import { post, hook } from '../lib/web';
   /* Start */
 
   pageView();
-})(window, 'umami.session');
+})(window);