diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js
index 3e7eebb5a..7a9b1a91d 100644
--- a/ui/admin/ember-cli-build.js
+++ b/ui/admin/ember-cli-build.js
@@ -26,6 +26,13 @@ module.exports = function (defaults) {
     svg: {
       paths: ['../../addons/core/public'],
     },
+    '@embroider/macros': {
+      setConfig: {
+        '@ember-data/store': {
+          polyfillUUID: true,
+        },
+      },
+    },
   });
 
   // Only import when in development or test mode
diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js
index c5399aabf..e4a78f9e6 100644
--- a/ui/desktop/ember-cli-build.js
+++ b/ui/desktop/ember-cli-build.js
@@ -26,6 +26,13 @@ module.exports = function (defaults) {
     svg: {
       paths: ['../../addons/core/public'],
     },
+    '@embroider/macros': {
+      setConfig: {
+        '@ember-data/store': {
+          polyfillUUID: true,
+        },
+      },
+    },
   });
 
   // Use `app.import` to add additional libraries to the generated