diff --git a/src/components/SettingsPage/RepairDeviceButton.js b/src/components/SettingsPage/RepairDeviceButton.js
index b3dc3457..9e9f2d54 100644
--- a/src/components/SettingsPage/RepairDeviceButton.js
+++ b/src/components/SettingsPage/RepairDeviceButton.js
@@ -42,9 +42,11 @@ class RepairDeviceButton extends PureComponent<Props, State> {
   open = () => this.setState({ opened: true, error: null })
 
   sub: *
+  timeout: *
 
   close = () => {
     if (this.sub) this.sub.unsubscribe()
+    if (this.timeout) clearTimeout(this.timeout)
     this.setState({ opened: false, isLoading: false, error: null, progress: 0 })
   }