diff --git a/suite-common/firmware/package.json b/suite-common/firmware/package.json
index 499f033415..15ecca0e83 100644
--- a/suite-common/firmware/package.json
+++ b/suite-common/firmware/package.json
@@ -14,7 +14,6 @@
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/thp": "workspace:*",
-        "@suite-common/wallet-core": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/device-utils": "workspace:*",
         "@trezor/env-utils": "workspace:*",
diff --git a/suite-common/firmware/src/firmwareThunks.ts b/suite-common/firmware/src/firmwareThunks.ts
index 039b8aa76a..f2cee7da6f 100644
--- a/suite-common/firmware/src/firmwareThunks.ts
+++ b/suite-common/firmware/src/firmwareThunks.ts
@@ -1,6 +1,5 @@
 import { createThunk } from '@suite-common/redux-utils';
 import { TrezorDevice } from '@suite-common/suite-types';
-import { selectSelectedDevice } from '@suite-common/wallet-core';
 import TrezorConnect, { FirmwareType } from '@trezor/connect';
 import { hasBitcoinOnlyFirmware, isBitcoinOnlyDevice } from '@trezor/device-utils';
 
@@ -47,7 +46,7 @@ export const firmwareUpdate = createThunk<
             services: { reportSecurityCheck },
         } = extra;
 
-        const device = selectSelectedDevice(getState());
+        const device = extra.selectors.selectDevice(getState());
         const binFilesBaseUrl = await dispatch(getBinFilesBaseUrlThunk()).unwrap();
         const suiteLanguage = selectLanguage(getState());
         const { useDevkit, cachedDevice, error } = selectFirmware(getState());
diff --git a/suite-common/firmware/src/hooks/useFirmwareInstallation.ts b/suite-common/firmware/src/hooks/useFirmwareInstallation.ts
index 18b43d47bf..34adf5f316 100644
--- a/suite-common/firmware/src/hooks/useFirmwareInstallation.ts
+++ b/suite-common/firmware/src/hooks/useFirmwareInstallation.ts
@@ -3,7 +3,6 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { ButtonRequest, FirmwareStatus, TrezorDevice } from '@suite-common/suite-types';
 import { THP_BUTTON_REQUESTS_NAMES, selectIsThpInProgress, selectThpStep } from '@suite-common/thp';
-import { selectSelectedDevice } from '@suite-common/wallet-core';
 import { DEVICE, type Device, DeviceButtonRequestPayload, FirmwareType, UI } from '@trezor/connect';
 import {
     DeviceModelInternal,
@@ -104,7 +103,6 @@ const shouldShowReconnectPrompt = ({
 export const useFirmwareInstallation = () => {
     const dispatch = useDispatch();
     const firmware = useSelector(selectFirmware);
-    const device = useSelector(selectSelectedDevice);
     const isThpInProgress = useSelector(selectIsThpInProgress);
     const thpStep = useSelector(selectThpStep);
     const switchFirmwareType = useSelector(selectSwitchFirmwareType);
@@ -127,7 +125,7 @@ export const useFirmwareInstallation = () => {
 
     // Device in its state before installation is cached when installation begins.
     // Until then, access device as normal.
-    const originalDevice = firmware.cachedDevice || device;
+    const originalDevice = firmware.cachedDevice;
 
     // To instruct user to reboot to bootloader manually, UI.FIRMWARE_DISCONNECT event is emitted first,
     // and UI.FIRMWARE_RECONNECT is emitted after the device disconnects.
diff --git a/suite-common/firmware/tsconfig.json b/suite-common/firmware/tsconfig.json
index 358e20dbaa..f14d6eadb5 100644
--- a/suite-common/firmware/tsconfig.json
+++ b/suite-common/firmware/tsconfig.json
@@ -5,7 +5,6 @@
         { "path": "../redux-utils" },
         { "path": "../suite-types" },
         { "path": "../thp" },
-        { "path": "../wallet-core" },
         { "path": "../../packages/connect" },
         { "path": "../../packages/device-utils" },
         { "path": "../../packages/env-utils" },
diff --git a/yarn.lock b/yarn.lock
index b8f4954a40..9e39492a4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11044,7 +11044,6 @@ __metadata:
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/thp": "workspace:*"
-    "@suite-common/wallet-core": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/device-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"