diff --git a/react/features/analytics/handlers/AmplitudeHandler.js b/react/features/analytics/handlers/AmplitudeHandler.js
index 8ac061a664..fcc198512e 100644
--- a/react/features/analytics/handlers/AmplitudeHandler.js
+++ b/react/features/analytics/handlers/AmplitudeHandler.js
@@ -28,6 +28,7 @@ export default class AmplitudeHandler extends AbstractHandler {
         };
 
         amplitude.getInstance(this._amplitudeOptions).init(amplitudeAPPKey, undefined, { includeReferrer: true });
+        amplitude.fixDeviceID(this._amplitudeOptions);
 
         if (user) {
             amplitude.getInstance(this._amplitudeOptions).setUserId(user);
diff --git a/react/features/analytics/handlers/amplitude/Amplitude.native.js b/react/features/analytics/handlers/amplitude/Amplitude.native.js
index 56dbd2ced2..b19c5f6aeb 100644
--- a/react/features/analytics/handlers/amplitude/Amplitude.native.js
+++ b/react/features/analytics/handlers/amplitude/Amplitude.native.js
@@ -111,5 +111,12 @@ export default {
         }
 
         return instance;
-    }
+    },
+
+    /**
+     * Currently not implemented.
+     *
+     * @returns {void}
+     */
+    fixDeviceID() { } // eslint-disable-line no-empty-function
 };
diff --git a/react/features/analytics/handlers/amplitude/Amplitude.web.js b/react/features/analytics/handlers/amplitude/Amplitude.web.js
index 449c9d3d20..b2b280cca0 100644
--- a/react/features/analytics/handlers/amplitude/Amplitude.web.js
+++ b/react/features/analytics/handlers/amplitude/Amplitude.web.js
@@ -1,7 +1,38 @@
 import amplitude from 'amplitude-js';
 
 export default {
+    /**
+     * Returns the AmplitudeClient instance.
+     *
+     * @param {Object} options - Optional parameters.
+     * @property {string} options.instanceName - The name of the AmplitudeClient instance.
+     * @returns {AmplitudeClient}
+     */
     getInstance(options = {}) {
         return amplitude.getInstance(options.instanceName);
+    },
+
+    /**
+     * Sets the device id to the value of __AMDID cookie or sets the __AMDID cookie value to the current device id in
+     * case the __AMDID cookie is not set.
+     *
+     * @param {*} options - Optional parameters.
+     * @property {string} options.instanceName - The name of the AmplitudeClient instance.
+     * @property {string} options.host - The host from the original URL.
+     * @returns {void}
+     */
+    fixDeviceID(options) {
+        const deviceId = document.cookie.replace(/(?:(?:^|.*;\s*)__AMDID\s*=\s*([^;]*).*$)|^.*$/, '$1');
+        const instance = this.getInstance(options);
+
+        if (deviceId === '') {
+            const { host = '' } = options;
+
+            document.cookie
+                = `__AMDID=${instance.options.deviceId};max-age=630720000${
+                    host === '' ? '' : `;domain=.${host}`}`; // max-age=10 years
+        } else {
+            instance.setDeviceId(deviceId);
+        }
     }
 };