diff --git a/change/@fluentui-react-popover-fe679067-7ac1-4e5f-84bc-528f6f0d3865.json b/change/@fluentui-react-popover-fe679067-7ac1-4e5f-84bc-528f6f0d3865.json
new file mode 100644
index 00000000000000..11d3927c387372
--- /dev/null
+++ b/change/@fluentui-react-popover-fe679067-7ac1-4e5f-84bc-528f6f0d3865.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix(react-popover): Only apply modal attributes if the PopoverSurface traps focus.",
+  "packageName": "@fluentui/react-popover",
+  "email": "esteban.230@hotmail.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-popover/src/components/PopoverSurface/__snapshots__/PopoverSurface.test.tsx.snap b/packages/react-components/react-popover/src/components/PopoverSurface/__snapshots__/PopoverSurface.test.tsx.snap
index bad1f93ae7068e..3bb7e104373959 100644
--- a/packages/react-components/react-popover/src/components/PopoverSurface/__snapshots__/PopoverSurface.test.tsx.snap
+++ b/packages/react-components/react-popover/src/components/PopoverSurface/__snapshots__/PopoverSurface.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`PopoverSurface renders a default state 1`] = `
 <div
   aria-label="test"
   class="fui-PopoverSurface"
-  data-tabster="{\\"restorer\\":{\\"type\\":0},\\"modalizer\\":{\\"id\\":\\"modal-1\\",\\"isOthersAccessible\\":true,\\"isAlwaysAccessible\\":true}}"
   data-testid="component"
   role="group"
 >
diff --git a/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurface.ts b/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurface.ts
index 690121577c0f87..ac0731e22d114b 100644
--- a/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurface.ts
+++ b/packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurface.ts
@@ -49,7 +49,7 @@ export const usePopoverSurface_unstable = (
         ref: useMergedRefs(ref, contentRef),
         role: trapFocus ? 'dialog' : 'group',
         'aria-modal': trapFocus ? true : undefined,
-        ...modalAttributes,
+        ...(trapFocus ? modalAttributes : {}),
         ...props,
       }),
       { elementType: 'div' },