diff --git a/src/components/SettingsPage/RepairDeviceButton.js b/src/components/SettingsPage/RepairDeviceButton.js
index 151e0e8f..9e9f2d54 100644
--- a/src/components/SettingsPage/RepairDeviceButton.js
+++ b/src/components/SettingsPage/RepairDeviceButton.js
@@ -33,28 +33,38 @@ class RepairDeviceButton extends PureComponent<Props, State> {
     progress: 0,
   }
 
+  componentWillUnmount() {
+    if (this.timeout) {
+      clearTimeout(this.timeout)
+    }
+  }
+
   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 })
   }
 
   repair = (version = null) => {
     if (this.state.isLoading) return
     const { push } = this.props
-    this.setState({ isLoading: true })
+    this.timeout = setTimeout(() => this.setState({ isLoading: true }), 500)
     this.sub = firmwareRepair.send({ version }).subscribe({
       next: patch => {
         this.setState(patch)
       },
       error: error => {
         logger.critical(error)
+        if (this.timeout) clearTimeout(this.timeout)
         this.setState({ error, isLoading: false, progress: 0 })
       },
       complete: () => {
+        if (this.timeout) clearTimeout(this.timeout)
         this.setState({ opened: false, isLoading: false, progress: 0 }, () => {
           push('/manager')
         })