diff --git a/app/constants/credentials.js b/app/constants/credentials.js
index 16fdaed41..a6fca2a8a 100644
--- a/app/constants/credentials.js
+++ b/app/constants/credentials.js
@@ -1,10 +1,11 @@
 // This file hosts the constants with the values used on native apps (User Defaults on iOS and Shared Preferences on Android).
-import { isIOS, isAndroid } from '../utils/deviceInfo'; // TODO: remove it
+import { isIOS } from '../utils/deviceInfo';
 
-export const IDENTIFIER = isIOS ? 'group.ios.chat.rocket' : 'chat.rocket.android';
+export const IDENTIFIER = isIOS ? 'group.ios.chat.rocket' : 'rocket.chat';
 export const SERVERS = isIOS ? 'kServers' : 'ACCOUNTS_KEY';
 export const TOKEN = isIOS ? 'kAuthToken' : 'authToken';
 export const USER_ID = isIOS ? 'kUserId' : 'userId';
 export const SERVER_URL = isIOS ? 'kAuthServerURL' : 'serverUrl';
 export const SERVER_NAME = isIOS ? 'kServerName' : 'serverName';
 export const SERVER_ICON = isIOS ? 'kServerIconURL' : 'serverLogoUrl';
+export const ANDROID_PACKAGE_CONTEXT = 'chat.rocket.android';
diff --git a/app/sagas/init.js b/app/sagas/init.js
index 9012ff3b7..d0d5d3dd6 100644
--- a/app/sagas/init.js
+++ b/app/sagas/init.js
@@ -14,14 +14,16 @@ import RocketChat from '../lib/rocketchat';
 import log from '../utils/log';
 import Navigation from '../lib/Navigation';
 import {
-	IDENTIFIER, SERVERS, SERVER_ICON, SERVER_NAME, SERVER_URL, TOKEN, USER_ID
+	IDENTIFIER, SERVERS, SERVER_ICON, SERVER_NAME, SERVER_URL, TOKEN, USER_ID, ANDROID_PACKAGE_CONTEXT
 } from '../constants/credentials';
 import database from '../lib/database';
 import protectedFunction from '../lib/methods/helpers/protectedFunction';
+import { isAndroid } from '../utils/deviceInfo';
 
 const restore = function* restore() {
 	try {
 		yield RNUserDefaults.setName(IDENTIFIER);
+		if (isAndroid) { yield RNUserDefaults.setPackageContext(ANDROID_PACKAGE_CONTEXT); }
 		const hasMigration = yield AsyncStorage.getItem('hasMigration');
 
 		let { token, server } = yield all({
diff --git a/package.json b/package.json
index 8fb836c33..0236e18f3 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "remove-markdown": "^0.3.0",
     "rn-extensions-share": "^2.3.10",
     "rn-fetch-blob": "^0.10.16",
-    "rn-user-defaults": "^1.4.5",
+    "rn-user-defaults": "^1.5.0",
     "semver": "6.3.0",
     "snyk": "1.210.0",
     "strip-ansi": "5.2.0",
diff --git a/yarn.lock b/yarn.lock
index 98596be2d..0a6aa3fdd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9587,10 +9587,10 @@ rn-host-detect@1.1.5, rn-host-detect@^1.1.5:
   resolved "https://registry.yarnpkg.com/rn-host-detect/-/rn-host-detect-1.1.5.tgz#fbecb982b73932f34529e97932b9a63e58d8deb6"
   integrity sha512-ufk2dFT3QeP9HyZ/xTuMtW27KnFy815CYitJMqQm+pgG3ZAtHBsrU8nXizNKkqXGy3bQmhEoloVbrfbvMJMqkg==
 
-rn-user-defaults@^1.4.5:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/rn-user-defaults/-/rn-user-defaults-1.4.5.tgz#97b2d2c04252fa3df1ed3dd03a803001f79734f0"
-  integrity sha512-0b7dsGuR7PUfN4zfuc9HVcCdDLaydqsPf35Cuwlfan+FS24GO3WMCIfP9MtlRLCcJ45wJnzMjQRwhZAfTidU9A==
+rn-user-defaults@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rn-user-defaults/-/rn-user-defaults-1.5.0.tgz#e6b9606e6a74c2ff7785eb4f2fed6bac7583db40"
+  integrity sha512-PRPpMkzI9/qo/8eCjfR8vKIsJFsmeFxPLT+Jy39X6D5WJLIXN4fY+IxIysOF6E7CkFRW8UCpwxeiMyldXN9Lqw==
 
 rsvp@^3.3.3:
   version "3.6.2"