diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 970567a5f..202cdff91 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -131,8 +131,10 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
 };
 
 Wallet.prototype._handleData = function(senderId, data, isInbound) {
+
   // TODO check message signature
-  if (this.id !== data.walletId) {
+  
+  if (data.type !== 'walletId' && this.id !== data.walletId) {
     this.emit('badMessage', senderId);
     this.log('badMessage FROM:', senderId); //TODO
     return;