diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js
index 188f03147..6b9784913 100644
--- a/www/common/common-messenger.js
+++ b/www/common/common-messenger.js
@@ -612,6 +612,15 @@ define([
                             cb();
                         });
                     });
+                } else {
+                    removeFromFriendList(curvePublic, function () {
+                        delete channels[channel.id];
+                        emit('UNFRIEND', {
+                            curvePublic: curvePublic,
+                            fromMe: true
+                        });
+                        cb();
+                    });
                 }
                 channel.wc.bcast(cryptMsg).then(function () {}, function (err) {
                     console.error(err);