diff --git a/packages/reisebuddy-communication/server/reisebuddyIncomingApi.js b/packages/reisebuddy-communication/server/reisebuddyIncomingApi.js
index fb1b4157eeea..cb2b40ede12f 100644
--- a/packages/reisebuddy-communication/server/reisebuddyIncomingApi.js
+++ b/packages/reisebuddy-communication/server/reisebuddyIncomingApi.js
@@ -45,13 +45,13 @@ RB_API.addRoute('incoming/:service', {
 			}
 		};
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.profile.token).fetch();
+			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor._id).fetch();
 			if (rooms && rooms.length > 0) {
 				sendStub.message.rid = rooms[0]._id;
 			} else {
 				sendStub.message.rid = Random.id();
 			}
-			sendStub.message.token = visitor.profile.token;
+			sendStub.message.token = visitor._id;
 		} else {
 			sendStub.message.rid = Random.id();
 			sendStub.message.token = Random.id();
diff --git a/packages/rocketchat-livechat/imports/server/rest/sms.js b/packages/rocketchat-livechat/imports/server/rest/sms.js
index d3b713535272..ccadc4eb2707 100644
--- a/packages/rocketchat-livechat/imports/server/rest/sms.js
+++ b/packages/rocketchat-livechat/imports/server/rest/sms.js
@@ -18,14 +18,14 @@ RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
 		};
 
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.profile.token).fetch();
+			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor._id).fetch();
 
 			if (rooms && rooms.length > 0) {
 				sendMessage.message.rid = rooms[0]._id;
 			} else {
 				sendMessage.message.rid = Random.id();
 			}
-			sendMessage.message.token = visitor.profile.token;
+			sendMessage.message.token = visitor._id;
 		} else {
 			sendMessage.message.rid = Random.id();
 			sendMessage.message.token = Random.id();
diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
index af9b79b264d1..0858c875ec52 100644
--- a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
+++ b/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
@@ -9,7 +9,7 @@ Meteor.methods({
 		const visitor = RocketChat.models.Users.getVisitorByToken(visitorToken);
 		const room = RocketChat.models.Rooms.findOneById(visitorRoom);
 
-		if (visitor !== undefined && room !== undefined && room.v !== undefined && visitor.profile !== undefined && room.v.token === visitor.profile.token) {
+		if (visitor !== undefined && room !== undefined && room.v !== undefined && visitor._id !== undefined && room.v.token === visitor._id) {
 			const updateData = {};
 			for (var item of formData) {
 				if (_.contains(['satisfaction', 'agentKnowledge', 'agentResposiveness', 'agentFriendliness'], item.name) && _.contains(['1', '2', '3', '4', '5'], item.value)) {
diff --git a/packages/rocketchat-livechat/server/rest/sms.js b/packages/rocketchat-livechat/server/rest/sms.js
index d3b713535272..7b9c4c7181f3 100644
--- a/packages/rocketchat-livechat/server/rest/sms.js
+++ b/packages/rocketchat-livechat/server/rest/sms.js
@@ -18,14 +18,14 @@ RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
 		};
 
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.profile.token).fetch();
+			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor._id).fetch();
 
 			if (rooms && rooms.length > 0) {
 				sendMessage.message.rid = rooms[0]._id;
 			} else {
 				sendMessage.message.rid = Random.id();
 			}
-			sendMessage.message.token = visitor.profile.token;
+			sendMessage.message.token = visitor._id
 		} else {
 			sendMessage.message.rid = Random.id();
 			sendMessage.message.token = Random.id();
diff --git a/packages/rocketchat-livechat/server/sendMessageBySMS.js b/packages/rocketchat-livechat/server/sendMessageBySMS.js
index a2f867833f57..e4f7e33c4c60 100644
--- a/packages/rocketchat-livechat/server/sendMessageBySMS.js
+++ b/packages/rocketchat-livechat/server/sendMessageBySMS.js
@@ -36,7 +36,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 
 	const visitor = RocketChat.models.Users.getVisitorByToken(room.v.token);
 
-	if (!visitor || !visitor.profile || !visitor.phone || visitor.phone.length === 0) {
+	if (!visitor || !visitor._id|| !visitor.phone || visitor.phone.length === 0) {
 		return message;
 	}