diff --git a/packages/components/src/components/Tooltip/Tooltip.test.tsx b/packages/components/src/components/Tooltip/Tooltip.test.tsx
index 6db89e8ddf7..c40c3a44f3c 100644
--- a/packages/components/src/components/Tooltip/Tooltip.test.tsx
+++ b/packages/components/src/components/Tooltip/Tooltip.test.tsx
@@ -74,4 +74,26 @@ describe('Tooltip', () => {
         const parent = triggerBefore.parentElement;
         expect(parent).toHaveAttribute('data-state', 'closed');
     });
+
+    it('should apply the cursor prop to the content wrapper', () => {
+        const tooltipContent = 'Tooltip Content';
+        render(
+            <Tooltip content={tooltipContent} cursor="pointer">
+                <button>Hover me</button>
+            </Tooltip>,
+        );
+
+        expect(screen.getByText('Hover me').parentElement).toHaveStyle({ cursor: 'pointer' });
+    });
+
+    it('should should apply the default=help cursor when the passed cursor is undefined', () => {
+        const tooltipContent = 'Tooltip Content';
+        render(
+            <Tooltip content={tooltipContent} cursor={undefined}>
+                <button>Hover me</button>
+            </Tooltip>,
+        );
+
+        expect(screen.getByText('Hover me').parentElement).toHaveStyle({ cursor: 'help' });
+    });
 });
diff --git a/packages/components/src/components/Tooltip/Tooltip.tsx b/packages/components/src/components/Tooltip/Tooltip.tsx
index 6ad82194d5e..a585f0c421c 100644
--- a/packages/components/src/components/Tooltip/Tooltip.tsx
+++ b/packages/components/src/components/Tooltip/Tooltip.tsx
@@ -46,11 +46,10 @@ type UnmanagedModeProps = {
 };
 
 type TooltipUiProps = {
-    isActive?: boolean; // Determines if the tooltip is activated - if it listens and reacts to the interaction
+    isActive?: boolean;
     children: ReactNode;
     className?: string;
     dashed?: boolean;
-    disabled?: boolean;
     offset?: number;
     shift?: ShiftOptions;
     cursor?: Cursor;
@@ -70,7 +69,6 @@ export type TooltipProps = (ManagedModeProps | UnmanagedModeProps) &
 export const Tooltip = ({
     isActive = true, // NOTE: determines, if the tooltip is actually working - is displayed, reacts to the events
     placement = 'top',
-    disabled = false, // NOTE: determines the appearance of the cursor over the tooltip trigger
     children,
     isLarge = false,
     dashed = false,
@@ -111,12 +109,7 @@ export const Tooltip = ({
                 delay={delayConfiguration}
             >
                 <TooltipTrigger>
-                    <Content
-                        $dashed={dashed}
-                        $isInline={isInline}
-                        $cursor={disabled ? 'not-allowed' : cursor}
-                        as={elType}
-                    >
+                    <Content $dashed={dashed} $isInline={isInline} $cursor={cursor} as={elType}>
                         {children}
                         {hasIcon && <Icon name="question" size="medium" />}
                     </Content>
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
index 7f59fae5215..2cebf8fad95 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
@@ -137,6 +137,7 @@ export const DeviceSelector = () => {
                     isActive={discoveryInProgress}
                     isFullWidth
                     placement="bottom"
+                    cursor="not-allowed"
                     content={<Translation id="TR_UNAVAILABLE_WHILE_LOADING" />}
                 >
                     <InnerContainer
diff --git a/packages/suite/src/views/dashboard/PromoBanner.tsx b/packages/suite/src/views/dashboard/PromoBanner.tsx
index 66cf772a07a..8312c1b549c 100644
--- a/packages/suite/src/views/dashboard/PromoBanner.tsx
+++ b/packages/suite/src/views/dashboard/PromoBanner.tsx
@@ -136,7 +136,7 @@ const StoreBadge = ({
     return (
         <Tooltip
             isOpen={isTooltipOpen}
-            disabled={isMobileLayout}
+            cursor={isMobileLayout ? 'not-allowed' : undefined}
             content={
                 <Column alignItems="center">
                     <StoreTitle
diff --git a/packages/suite/src/views/settings/SettingsDevice/FirmwareVersion.tsx b/packages/suite/src/views/settings/SettingsDevice/FirmwareVersion.tsx
index 6ae4dc2bbe4..4807d5d2e66 100644
--- a/packages/suite/src/views/settings/SettingsDevice/FirmwareVersion.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/FirmwareVersion.tsx
@@ -100,7 +100,10 @@ export const FirmwareVersion = ({ isDeviceLocked }: FirmwareVersionProps) => {
                                 id="TR_YOUR_FIRMWARE_VERSION"
                                 values={{
                                     version: (
-                                        <VersionTooltip content={revision} disabled={!revision}>
+                                        <VersionTooltip
+                                            content={revision}
+                                            cursor={!revision ? 'not-allowed' : undefined}
+                                        >
                                             {revision ? (
                                                 <TrezorLink href={changelogUrl} variant="nostyle">
                                                     <GithubButton />