diff --git a/lib/addressbook.js b/lib/addressbook.js
index a51a6db..2fa730f 100644
--- a/lib/addressbook.js
+++ b/lib/addressbook.js
@@ -14,7 +14,7 @@ function _composeKeyword(partner) {
 }
 
 function get(partner) {
-    partner = partner.toUpperCase();
+    partner = partner.toUpperCase().replace(/@.*$/, '');
     return new Promise(function(resolve) {
         if (_caches[partner]) {
             resolve(_caches[partner]);
@@ -42,6 +42,7 @@ function get(partner) {
 }
 
 function put(partner, chatId) {
+    partner = partner.toUpperCase().replace(/@.*$/, '');
     if (!partner || !chatId) {
         return;
     }
diff --git a/lib/transport.js b/lib/transport.js
index 433a127..38fbc6f 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -84,6 +84,7 @@ async function send(partner, msg) {
     const chatId = await addressbook.get(partner);
     if (!chatId) {
         logger.info('Not sending message because partner does not exist on address book', {transport: 'telegram', me: me, partner: partner, msg: msg });
+        return;
     }
 
     logger.info('Sending message via Telegram transport', { transport: 'telegram', me: me, partner: partner, msg: msg });