diff --git a/src/components/SettingsPage/RepairDeviceButton.js b/src/components/SettingsPage/RepairDeviceButton.js
index b36e6254..b3dc3457 100644
--- a/src/components/SettingsPage/RepairDeviceButton.js
+++ b/src/components/SettingsPage/RepairDeviceButton.js
@@ -58,9 +58,11 @@ class RepairDeviceButton extends PureComponent<Props, State> {
       },
       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')
         })