diff --git a/package.json b/package.json
index 14d24be..ee9ce2d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "author": "Stefan Malzner <stefan@adlk.io>",
   "license": "MIT",
   "config": {
-    "serviceURL": "https://web.telegram.org",
+    "serviceURL": "https://webk.telegram.org/",
     "hasDirectMessages": true,
     "hasNotificationSound": true
   }
diff --git a/webview.js b/webview.js
index 99a1369..a5955ab 100644
--- a/webview.js
+++ b/webview.js
@@ -1,20 +1,16 @@
 const path = require('path');
 
-module.exports = (Franz) => {
+module.exports = Franz => {
   const getMessages = function getMessages() {
+    const messages = document.querySelectorAll('li.rp:not(.is-muted)');  
     let count = 0;
-    const searchElement = document.querySelector('.im_dialogs_search_field');
-    if (searchElement && searchElement.value === '') {
-      const elements = document.querySelectorAll('.im_dialog_badge:not(.ng-hide):not(.im_dialog_badge_muted)');
-      if (elements) {
-        for (let i = 0; i < elements.length; i += 1) {
-          if (elements[i].innerHTML !== 0) {
-            count += 1;
-          }
-        }
-      }
-    }
-
+	  for (let i = 0; i < messages.length; i += 1) {
+	    const message = messages[i].querySelector('div.unread');
+	    if (!!message && message.innerHTML !== '') {
+		    count += 1;
+	    }
+	  }
+    
     Franz.setBadge(count);
   };