diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0604f9b091..a568ec6172 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -385,10 +385,10 @@ PODS:
     - React-Core
   - react-native-splash-screen (3.3.0):
     - React-Core
-  - react-native-video (6.0.0-alpha.1):
+  - react-native-video (6.0.0-alpha.7):
     - React-Core
-    - react-native-video/Video (= 6.0.0-alpha.1)
-  - react-native-video/Video (6.0.0-alpha.1):
+    - react-native-video/Video (= 6.0.0-alpha.7)
+  - react-native-video/Video (6.0.0-alpha.7):
     - PromisesSwift
     - React-Core
   - react-native-webrtc (111.0.3):
@@ -759,7 +759,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
   react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
-  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
+  react-native-video: 967eead48aaa42c25a9e1d65c3b1ab30762a88df
   react-native-webrtc: 4d1669c2ed29767fe70b0169428b4466589ecf8b
   react-native-webview: 8baa0f5c6d336d6ba488e942bcadea5bf51f050a
   React-perflogger: fdee2a0c512167ae4c19c4e230ccf6aa66a6aff0
diff --git a/package-lock.json b/package-lock.json
index 5976e6d122..a0a965d133 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "react-native-svg-transformer": "1.1.0",
         "react-native-tab-view": "3.5.2",
         "react-native-url-polyfill": "2.0.0",
-        "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
+        "react-native-video": "6.0.0-alpha.7",
         "react-native-watch-connectivity": "1.1.0",
         "react-native-webrtc": "111.0.3",
         "react-native-webview": "13.5.1",
@@ -16528,10 +16528,9 @@
       }
     },
     "node_modules/react-native-video": {
-      "version": "6.0.0-alpha.1",
-      "resolved": "git+https://git@github.com/react-native-video/react-native-video.git#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
-      "integrity": "sha512-ep7IawO/T8Ch250ZQgpiGmKzWaHLdpSRhXyGZTY4RG2kXmWD0BdIfORj/p1LouPLGjy0k3CXaVYt9a/KI0ZAcA==",
-      "license": "MIT",
+      "version": "6.0.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-6.0.0-alpha.7.tgz",
+      "integrity": "sha512-X/siSaJf0V//IbnozjDm1jAjNaXlFy6Hbr6X8GNFl/ztLvN+Z8R/Quq9Q8o22XVwlPacPQ9VS/G0Stdktn0FEw==",
       "dependencies": {
         "deprecated-react-native-prop-types": "^2.2.0",
         "keymirror": "^0.1.1",
@@ -32574,9 +32573,9 @@
       }
     },
     "react-native-video": {
-      "version": "git+https://git@github.com/react-native-video/react-native-video.git#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
-      "integrity": "sha512-ep7IawO/T8Ch250ZQgpiGmKzWaHLdpSRhXyGZTY4RG2kXmWD0BdIfORj/p1LouPLGjy0k3CXaVYt9a/KI0ZAcA==",
-      "from": "react-native-video@https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
+      "version": "6.0.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-6.0.0-alpha.7.tgz",
+      "integrity": "sha512-X/siSaJf0V//IbnozjDm1jAjNaXlFy6Hbr6X8GNFl/ztLvN+Z8R/Quq9Q8o22XVwlPacPQ9VS/G0Stdktn0FEw==",
       "requires": {
         "deprecated-react-native-prop-types": "^2.2.0",
         "keymirror": "^0.1.1",
diff --git a/package.json b/package.json
index 7d715287b0..58bcc70af7 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "react-native-svg-transformer": "1.1.0",
     "react-native-tab-view": "3.5.2",
     "react-native-url-polyfill": "2.0.0",
-    "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
+    "react-native-video": "6.0.0-alpha.7",
     "react-native-watch-connectivity": "1.1.0",
     "react-native-webrtc": "111.0.3",
     "react-native-webview": "13.5.1",
diff --git a/react/features/analytics/handlers/amplitude/fixDeviceID.native.ts b/react/features/analytics/handlers/amplitude/fixDeviceID.native.ts
index 79a88ef19b..68a7dd5d40 100644
--- a/react/features/analytics/handlers/amplitude/fixDeviceID.native.ts
+++ b/react/features/analytics/handlers/amplitude/fixDeviceID.native.ts
@@ -1,6 +1,6 @@
 import { Amplitude } from '@amplitude/react-native';
 import DefaultPreference from 'react-native-default-preference';
-import { syncUniqueId } from 'react-native-device-info';
+import { getUniqueId } from 'react-native-device-info';
 
 import logger from '../../logger';
 
@@ -19,15 +19,15 @@ export async function fixDeviceID(amplitude: Amplitude) {
     if (current) {
         await amplitude.setDeviceId(current);
     } else {
-        syncUniqueId().then(uid => {
-            if (!uid) {
-                logger.warn('Device ID is not set!');
+        const uid = await getUniqueId();
 
-                return;
-            }
+        if (!uid) {
+            logger.warn('Device ID is not set!');
 
-            amplitude.setDeviceId(uid as string);
-            DefaultPreference.set('amplitudeDeviceId', uid as string);
-        });
+            return;
+        }
+
+        await amplitude.setDeviceId(uid as string);
+        await DefaultPreference.set('amplitudeDeviceId', uid as string);
     }
 }