diff --git a/app/livechat/client/views/app/livechatAppearance.html b/app/livechat/client/views/app/livechatAppearance.html
index 531bbfabbe4e4..6788da13c10b5 100644
--- a/app/livechat/client/views/app/livechatAppearance.html
+++ b/app/livechat/client/views/app/livechatAppearance.html
@@ -71,6 +71,16 @@ <h2>{{_ "Settings"}}</h2>
 						<textarea class="preview-settings rc-input__element" name="offlineSuccessMessage" id="offlineSuccessMessage">{{offlineSuccessMessage}}</textarea>
 					</div>
 				</fieldset>
+				<fieldset>
+					<legend>{{_ "Livechat_feedback_form"}}</legend>
+					<label class="rc-switch__label">
+						<input class="rc-switch__input js-input-check" type="checkbox" name="feedbackFormEnabled" {{feedbackFormEnabled}}/>
+						<span class="rc-switch__button">
+							<span class="rc-switch__button-inside"></span>
+						</span>
+						<span class="rc-switch__text">{{_ "Show_feedback_form"}}</span>
+					</label>
+				</fieldset>
 				<fieldset>
 					<legend>{{_ "Livechat_registration_form"}}</legend>
 					<!--
diff --git a/app/livechat/client/views/app/livechatAppearance.js b/app/livechat/client/views/app/livechatAppearance.js
index 6fcca80a9e1be..1e4fffa336891 100644
--- a/app/livechat/client/views/app/livechatAppearance.js
+++ b/app/livechat/client/views/app/livechatAppearance.js
@@ -104,6 +104,11 @@ Template.livechatAppearance.helpers({
 	registrationFormMessage() {
 		return Template.instance().registrationFormMessage.get();
 	},
+	feedbackFormEnabled() {
+		if (Template.instance().feedbackFormEnabled.get()) {
+			return 'checked';
+		}
+	},
 });
 
 Template.livechatAppearance.onCreated(async function() {
@@ -126,6 +131,7 @@ Template.livechatAppearance.onCreated(async function() {
 	this.registrationFormNameFieldEnabled = new ReactiveVar(null);
 	this.registrationFormEmailFieldEnabled = new ReactiveVar(null);
 	this.registrationFormMessage = new ReactiveVar(null);
+	this.feedbackFormEnabled = new ReactiveVar(null);
 
 	const { appearance } = await APIClient.v1.get('livechat/appearance');
 	this.appearance.set(appearance);
@@ -147,6 +153,7 @@ Template.livechatAppearance.onCreated(async function() {
 	const livechatNameFieldRegistrationForm = getSettingFromAppearance(this, 'Livechat_name_field_registration_form');
 	const livechatEmailFieldRegistrationForm = getSettingFromAppearance(this, 'Livechat_email_field_registration_form');
 	const conversationFinishedText = getSettingFromAppearance(this, 'Livechat_conversation_finished_text');
+	const livechatFeedbackForm = getSettingFromAppearance(this, 'Livechat_feedback_form');
 
 	this.title.set(livechatTitle && livechatTitle.value);
 	this.color.set(livechatTitleColor && livechatTitleColor.value);
@@ -165,6 +172,7 @@ Template.livechatAppearance.onCreated(async function() {
 	this.registrationFormNameFieldEnabled.set(livechatNameFieldRegistrationForm && livechatNameFieldRegistrationForm.value);
 	this.registrationFormEmailFieldEnabled.set(livechatEmailFieldRegistrationForm && livechatEmailFieldRegistrationForm.value);
 	this.conversationFinishedText.set(conversationFinishedText && conversationFinishedText.value);
+	this.feedbackFormEnabled.set(livechatFeedbackForm && livechatFeedbackForm.value);
 });
 
 Template.livechatAppearance.events({
@@ -228,6 +236,9 @@ Template.livechatAppearance.events({
 
 		const settingRegistrationFormMessage = getSettingFromAppearance(instance, 'Livechat_registration_form_message');
 		instance.registrationFormMessage.set(settingRegistrationFormMessage && settingRegistrationFormMessage.value);
+
+		const settingFeedbackFormEnabled = getSettingFromAppearance(instance, 'Livechat_feedback_form');
+		instance.feedbackFormEnabled.set(settingFeedbackFormEnabled && settingFeedbackFormEnabled.value);
 	},
 	'submit .rocket-form'(e, instance) {
 		e.preventDefault();
@@ -300,6 +311,10 @@ Template.livechatAppearance.events({
 				_id: 'Livechat_registration_form_message',
 				value: s.trim(instance.registrationFormMessage.get()),
 			},
+			{
+				_id: 'Livechat_feedback_form',
+				value: instance.feedbackFormEnabled.get(),
+			},
 		];
 
 		Meteor.call('livechat:saveAppearance', settings, (err/* , success*/) => {
diff --git a/app/livechat/server/api/lib/appearance.js b/app/livechat/server/api/lib/appearance.js
index 8d2f6b79963cc..b8745a27b798c 100644
--- a/app/livechat/server/api/lib/appearance.js
+++ b/app/livechat/server/api/lib/appearance.js
@@ -25,6 +25,7 @@ export async function findAppearance({ userId }) {
 				'Livechat_email_field_registration_form',
 				'Livechat_registration_form_message',
 				'Livechat_conversation_finished_text',
+				'Livechat_feedback_form',
 			],
 		},
 	};
diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
index 4626ce819b35c..82bae3b3e5e9f 100644
--- a/app/livechat/server/api/lib/livechat.js
+++ b/app/livechat/server/api/lib/livechat.js
@@ -111,6 +111,7 @@ export function settings() {
 			forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent,
 			showConnecting: initSettings.Livechat_Show_Connecting,
 			agentHiddenInfo: initSettings.Livechat_show_agent_info === false,
+			showFeedbackForm: initSettings.Livechat_feedback_form,
 		},
 		theme: {
 			title: initSettings.Livechat_title,
@@ -133,7 +134,7 @@ export function settings() {
 			dataProcessingConsentText: initSettings.Livechat_data_processing_consent_text,
 		},
 		survey: {
-			items: ['satisfaction', 'agentKnowledge', 'agentResposiveness', 'agentFriendliness'],
+			items: ['rating'],
 			values: ['1', '2', '3', '4', '5'],
 		},
 		triggers,
diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
index 780425f68b29f..c5cde3db412a2 100644
--- a/app/livechat/server/config.js
+++ b/app/livechat/server/config.js
@@ -139,6 +139,14 @@ Meteor.startup(function() {
 		i18nLabel: 'Conversation_finished_text',
 	});
 
+	settings.add('Livechat_feedback_form', false, {
+		type: 'boolean',
+		group: 'Omnichannel',
+		section: 'Livechat',
+		public: true,
+		i18nLabel: 'Show_feedback_form',
+	});
+
 	settings.add('Livechat_registration_form', true, {
 		type: 'boolean',
 		group: 'Omnichannel',
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 0214768ee06b2..8107aa2ca46ad 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -452,6 +452,7 @@ export const Livechat = {
 			'Livechat_force_accept_data_processing_consent',
 			'Livechat_data_processing_consent_text',
 			'Livechat_show_agent_info',
+			'Livechat_feedback_form',
 		]).forEach((setting) => {
 			rcSettings[setting._id] = setting.value;
 		});
diff --git a/app/livechat/server/methods/saveAppearance.js b/app/livechat/server/methods/saveAppearance.js
index 99e57ce6ef2e7..6a8acf04f85be 100644
--- a/app/livechat/server/methods/saveAppearance.js
+++ b/app/livechat/server/methods/saveAppearance.js
@@ -27,6 +27,7 @@ Meteor.methods({
 			'Livechat_name_field_registration_form',
 			'Livechat_email_field_registration_form',
 			'Livechat_registration_form_message',
+			'Livechat_feedback_form',
 		];
 
 		const valid = settings.every((setting) => validSettings.indexOf(setting._id) !== -1);
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 253e8a0bab242..28a39867dfb07 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2246,6 +2246,7 @@
   "Livechat_Dashboard": "Omnichannel Dashboard",
   "Livechat_DepartmentOfflineMessageToChannel": "Send this department's Livechat offline messages to a channel",
   "Livechat_enabled": "Omnichannel enabled",
+  "Livechat_feedback_form": "Feedback form",
   "Livechat_Facebook_API_Key": "OmniChannel API Key",
   "Livechat_Facebook_API_Secret": "OmniChannel API Secret",
   "Livechat_Facebook_Enabled": "Facebook integration enabled",
@@ -3239,6 +3240,7 @@
   "Show_Avatars": "Show Avatars",
   "Show_counter": "Show counter",
   "Show_email_field": "Show email field",
+  "Show_feedback_form": "Show feedback form",
   "Show_Message_In_Main_Thread": "Show thread messages in the main thread",
   "Show_more": "Show more",
   "Show_name_field": "Show name field",