diff --git a/src/components/EnsureDeviceApp.js b/src/components/EnsureDeviceApp.js
index 75c11063..6e1be5ac 100644
--- a/src/components/EnsureDeviceApp.js
+++ b/src/components/EnsureDeviceApp.js
@@ -85,11 +85,12 @@ class EnsureDeviceApp extends Component<{
   }
 
   render() {
-    const { account, currency, ...props } = this.props
+    const { account, currency, device, ...props } = this.props
     const cur = account ? account.currency : currency
     const Icon = cur ? getCryptoCurrencyIcon(cur) : null
     return (
       <DeviceInteraction
+        key={device ? device.path : null}
         shouldRenderRetry
         steps={[
           {
diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js
index dac98acc..eb599bd9 100644
--- a/src/components/GenuineCheck.js
+++ b/src/components/GenuineCheck.js
@@ -115,7 +115,7 @@ class GenuineCheck extends PureComponent<Props> {
   }
 
   render() {
-    const { onSuccess, ...props } = this.props
+    const { onSuccess, device, ...props } = this.props
     const steps = [
       {
         id: 'device',
@@ -156,6 +156,7 @@ class GenuineCheck extends PureComponent<Props> {
 
     return (
       <DeviceInteraction
+        key={device ? device.path : null}
         {...props}
         waitBeforeSuccess={500}
         steps={steps}