diff --git a/src/actions/RouterActions.js b/src/actions/RouterActions.js
index d513611f..8bab4d55 100644
--- a/src/actions/RouterActions.js
+++ b/src/actions/RouterActions.js
@@ -250,10 +250,14 @@ export const selectDevice = (device: TrezorDevice | Device): ThunkAction => (dis
 /*
 * Redirect to first device or landing page
 */
-export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch): void => {
+export const selectFirstAvailableDevice = (): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
     const url = dispatch(getFirstAvailableDeviceUrl());
     if (url) {
-        dispatch(goto(url));
+        const currentParams = getState().router.location.state;
+        const requestedParams = dispatch(pathToParams(url));
+        if (currentParams.device !== requestedParams.device || currentParams.deviceInstance !== requestedParams.deviceInstance) {
+            dispatch(goto(url));
+        }
     } else {
         dispatch(gotoLandingPage());
     }