diff --git a/src/components/modals/index.js b/src/components/modals/index.js
index 7fcb70db..4c98ae9d 100644
--- a/src/components/modals/index.js
+++ b/src/components/modals/index.js
@@ -191,13 +191,13 @@ const getQrModal = (props: Props) => {
 };
 
 const getConfirmationModal = (props: Props) => {
-    const { modal, modalActions } = props;
+    const { modal, modalActions, wallet } = props;
 
     if (modal.context !== MODAL.CONTEXT_CONFIRMATION) return null;
 
     switch (modal.windowType) {
         case 'no-backup':
-            return (<ConfirmNoBackup onReceiveConfirmation={modalActions.onReceiveConfirmation} />);
+            return (<ConfirmNoBackup device={wallet.selectedDevice} onReceiveConfirmation={modalActions.onReceiveConfirmation} />);
         default:
             return null;
     }
diff --git a/src/utils/url.js b/src/utils/url.js
index e4ca9992..b59a2991 100644
--- a/src/utils/url.js
+++ b/src/utils/url.js
@@ -3,7 +3,7 @@ import urlConstants from 'constants/urls';
 import type { TrezorDevice } from 'flowtype';
 
 const getOldWalletUrl = (device: ?TrezorDevice): string => {
-    if (!device) return urlConstants.OLD_WALLET_BETA;
+    if (!device || !device.firmwareRelease) return urlConstants.OLD_WALLET_BETA;
     const release = device.firmwareRelease;
     const url = release.channel === 'beta' ? urlConstants.OLD_WALLET_BETA : urlConstants.OLD_WALLET;
     return url;