diff --git a/ee/app/ldap-enterprise/server/index.js b/ee/app/ldap-enterprise/server/index.js
index 66314d8fc6fe5..dc3a50c2fb21a 100644
--- a/ee/app/ldap-enterprise/server/index.js
+++ b/ee/app/ldap-enterprise/server/index.js
@@ -4,6 +4,7 @@ import './hooks/syncExistentUser';
 import './hooks/beforeSearchAll';
 
 import { callbacks } from '../../../../app/callbacks/server';
+import { settings } from '../../../../app/settings';
 import { onLicense } from '../../license/server';
 
 onLicense('ldap-enterprise', () => {
@@ -14,6 +15,19 @@ onLicense('ldap-enterprise', () => {
 	Meteor.startup(function() {
 		createSettings();
 		validateLDAPRolesMappingChanges();
-		callbacks.add('afterLDAPLogin', onLdapLogin);
+
+		let LDAP_Enable_LDAP_Roles_To_RC_Roles;
+		settings.get('LDAP_Enable_LDAP_Roles_To_RC_Roles', (key, value) => {
+			if (LDAP_Enable_LDAP_Roles_To_RC_Roles === value) {
+				return;
+			}
+
+			LDAP_Enable_LDAP_Roles_To_RC_Roles = value;
+			if (!value) {
+				return callbacks.remove('afterLDAPLogin', 'checkRoleMapping');
+			}
+
+			callbacks.add('afterLDAPLogin', onLdapLogin, callbacks.priority.MEDIUM, 'checkRoleMapping');
+		});
 	});
 });