diff --git a/app/definitions/ILoggedUser.ts b/app/definitions/ILoggedUser.ts
index b9864b2d4..c13d420fb 100644
--- a/app/definitions/ILoggedUser.ts
+++ b/app/definitions/ILoggedUser.ts
@@ -23,28 +23,16 @@ export interface ILoggedUser {
 	enableMessageParserEarlyAdoption?: boolean;
 }
 
+export interface ILoggedUserResultFromServer
+	extends Omit<ILoggedUser, 'enableMessageParserEarlyAdoption' | 'showMessageInMainThread'> {
+	settings: IUserSettings;
+}
+
 export interface ILoginResultFromServer {
 	status: string;
 	authToken: string;
 	userId: string;
-	me: {
-		id: string;
-		token: string;
-		username: string;
-		name: string;
-		language?: string;
-		status: UserStatus;
-		statusText?: string;
-		customFields?: {
-			[key: string]: any;
-		};
-		statusLivechat?: string;
-		emails?: IUserEmail[];
-		roles?: string[];
-		avatarETag?: string;
-		isFromWebView?: boolean;
-		settings: IUserSettings;
-	};
+	me: ILoggedUserResultFromServer;
 }
 
 export type TLoggedUserModel = ILoggedUser & Model;
diff --git a/app/definitions/IRocketChat.ts b/app/definitions/IRocketChat.ts
index 91d701a5d..654e2c92c 100644
--- a/app/definitions/IRocketChat.ts
+++ b/app/definitions/IRocketChat.ts
@@ -4,7 +4,6 @@ type TRocketChat = typeof rocketchat;
 
 export interface IRocketChat extends TRocketChat {
 	sdk: any;
-	shareSDK: any;
 	activeUsersSubTimeout: any;
 	roomsSub: any;
 }
diff --git a/app/lib/rocketchat/services/connect.ts b/app/lib/rocketchat/services/connect.ts
index 0b0d84898..a3e9c3523 100644
--- a/app/lib/rocketchat/services/connect.ts
+++ b/app/lib/rocketchat/services/connect.ts
@@ -1,7 +1,6 @@
 import RNFetchBlob from 'rn-fetch-blob';
-import { Rocketchat as RocketchatClient, settings as RocketChatSettings } from '@rocket.chat/sdk';
+import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 
-import { useSsl } from '../../../utils/url';
 import { selectServerFailure } from '../../../actions/server';
 import { twoFactor } from '../../../utils/twoFactor';
 import { compareServerVersion } from '../../utils';
@@ -183,7 +182,7 @@ async function getServerInfo(server: string) {
 }
 
 async function getWebsocketInfo({ server }: { server: string }) {
-	const sdk = new RocketchatClient({ host: server, protocol: 'ddp', useSsl: useSsl(server) });
+	sdk.initialize(server);
 
 	try {
 		await sdk.connect();
diff --git a/app/lib/rocketchat/services/sdk.ts b/app/lib/rocketchat/services/sdk.ts
index 13af977e2..a23f66217 100644
--- a/app/lib/rocketchat/services/sdk.ts
+++ b/app/lib/rocketchat/services/sdk.ts
@@ -174,6 +174,10 @@ class Sdk {
 	abort() {
 		return this.sdk.abort();
 	}
+
+	connect() {
+		return this.sdk.connect();
+	}
 }
 
 const sdk = new Sdk();