diff --git a/lib/gui/app/models/store.js b/lib/gui/app/models/store.js
index 10e7d2d9..6477b280 100644
--- a/lib/gui/app/models/store.js
+++ b/lib/gui/app/models/store.js
@@ -251,18 +251,16 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
         })
       }
 
-      if (!_.isUndefined(action.data.percentage)) {
-        if (!utils.isValidPercentage(action.data.percentage)) {
-          throw errors.createError({
-            title: `Invalid state percentage: ${action.data.percentage}`
-          })
-        }
+      if (!_.isUndefined(action.data.percentage) && !utils.isValidPercentage(action.data.percentage)) {
+        throw errors.createError({
+          title: `Invalid state percentage: ${action.data.percentage}`
+        })
+      }
 
-        if (!_.isNumber(action.data.eta)) {
-          throw errors.createError({
-            title: `Invalid state eta: ${action.data.eta}`
-          })
-        }
+      if (!_.isUndefined(action.data.eta) && !_.isNumber(action.data.eta)) {
+        throw errors.createError({
+          title: `Invalid state eta: ${action.data.eta}`
+        })
       }
 
       return state.set('flashState', Immutable.fromJS(action.data))