diff --git a/packages/core/admin/server/controllers/__tests__/admin.test.js b/packages/core/admin/server/controllers/__tests__/admin.test.js
index dd8a58ddac..e2fd463f9d 100644
--- a/packages/core/admin/server/controllers/__tests__/admin.test.js
+++ b/packages/core/admin/server/controllers/__tests__/admin.test.js
@@ -40,6 +40,10 @@ describe('Admin Controller', () => {
       const result = await adminController.init();
 
       expect(global.strapi.config.get).toHaveBeenCalledWith('uuid', false);
+      expect(global.strapi.config.get).toHaveBeenCalledWith(
+        'packageJsonStrapi.telemetryDisabled',
+        null
+      );
       expect(global.strapi.admin.services.user.exists).toHaveBeenCalled();
       expect(result.data).toBeDefined();
       expect(result.data).toStrictEqual({
diff --git a/packages/core/admin/server/controllers/admin.js b/packages/core/admin/server/controllers/admin.js
index aeaf7c681e..f9cacfeceb 100644
--- a/packages/core/admin/server/controllers/admin.js
+++ b/packages/core/admin/server/controllers/admin.js
@@ -39,8 +39,13 @@ module.exports = {
   async init() {
     let uuid = strapi.config.get('uuid', false);
     const hasAdmin = await getService('user').exists();
-    const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', false);
-    if (telemetryDisabled) uuid = null;
+    // set to null if telemetryDisabled flag not avaialble in package.json
+    const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled', null);
+
+    if (telemetryDisabled !== null && telemetryDisabled === true) {
+      uuid = false;
+    }
+
     return { data: { uuid, hasAdmin } };
   },