diff --git a/app/lib/methods/subscriptions/inquiry.js b/app/ee/omnichannel/lib/subscriptions/inquiry.js
similarity index 77%
rename from app/lib/methods/subscriptions/inquiry.js
rename to app/ee/omnichannel/lib/subscriptions/inquiry.js
index 731267051..02eafb8a9 100644
--- a/app/lib/methods/subscriptions/inquiry.js
+++ b/app/ee/omnichannel/lib/subscriptions/inquiry.js
@@ -1,12 +1,12 @@
-import log from '../../../utils/log';
-import store from '../../createStore';
-import RocketChat from '../../rocketchat';
+import log from '../../../../utils/log';
+import store from '../../../../lib/createStore';
+import RocketChat from '../../../../lib/rocketchat';
 import {
 	inquiryRequest,
 	inquiryQueueAdd,
 	inquiryQueueUpdate,
 	inquiryQueueRemove
-} from '../../../ee/omnichannel/actions/inquiry';
+} from '../../actions/inquiry';
 
 const removeListener = listener => listener.stop();
 
@@ -63,9 +63,9 @@ export default function subscribeInquiry() {
 		}
 	};
 
-	connectedListener = this.sdk.onStreamData('connected', handleConnection);
-	disconnectedListener = this.sdk.onStreamData('close', handleConnection);
-	queueListener = this.sdk.onStreamData(streamTopic, handleQueueMessageReceived);
+	connectedListener = RocketChat.onStreamData('connected', handleConnection);
+	disconnectedListener = RocketChat.onStreamData('close', handleConnection);
+	queueListener = RocketChat.onStreamData(streamTopic, handleQueueMessageReceived);
 
 	try {
 		const { user } = store.getState().login;
@@ -74,13 +74,13 @@ export default function subscribeInquiry() {
 				const { departments } = result;
 
 				if (!departments.length || RocketChat.hasRole('livechat-manager')) {
-					this.sdk.subscribe(streamTopic, 'public').catch(e => console.log(e));
+					RocketChat.subscribe(streamTopic, 'public').catch(e => console.log(e));
 				}
 
 				const departmentIds = departments.map(({ departmentId }) => departmentId);
 				departmentIds.forEach((departmentId) => {
 					// subscribe to all departments of the agent
-					this.sdk.subscribe(streamTopic, `department/${ departmentId }`).catch(e => console.log(e));
+					RocketChat.subscribe(streamTopic, `department/${ departmentId }`).catch(e => console.log(e));
 				});
 			}
 		});
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 5d10e9eb5..8e8f6bd47 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -19,7 +19,7 @@ import {
 } from '../actions/share';
 
 import subscribeRooms from './methods/subscriptions/rooms';
-import subscribeInquiry from './methods/subscriptions/inquiry';
+import subscribeInquiry from '../ee/omnichannel/lib/subscriptions/inquiry';
 import getUsersPresence, { getUserPresence, subscribeUsersPresence } from './methods/getUsersPresence';
 
 import protectedFunction from './methods/helpers/protectedFunction';