diff --git a/main.js b/main.js
index 23dd145..c3015ba 100644
--- a/main.js
+++ b/main.js
@@ -68,7 +68,6 @@ function checkSMS() {
                     if (settings.smsonlyto.length > 0 && settings.smsonlyto.indexOf(msg.to) != -1) {
                         logger.info("Received SMS from " + msg.from + " for " + msg.to + ": " + msg.body);
                         createOrJoinSMSRoom(msg.from, msg.to, function (roomid) {
-                            client.setRoomTag(roomid, "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: msg.from, ournumber: msg.to});
                             sendMatrix(roomid, msg.body, msg.media);
                         });
                     } else {
@@ -120,9 +119,10 @@ function createOrJoinSMSRoom(tel, ournumber, callback) {
                 callback(room.room_id);
             });
         }
+        return;
     }).catch((err) => {
         // room doesn't exist, create it
-        //logger.debug(err);
+        logger.debug(err);
         logger.debug("Room " + roomName + " does not exist. Creating it now.");
         var userPowerLevels = {};
         for (var i = 0; i < settings.inviteusers.length; i++) {