diff --git a/core/frontend/src/components/wizard/Wizard.vue b/core/frontend/src/components/wizard/Wizard.vue
index b6bd4bba0..defa75d2d 100644
--- a/core/frontend/src/components/wizard/Wizard.vue
+++ b/core/frontend/src/components/wizard/Wizard.vue
@@ -141,7 +141,7 @@
             <v-row class="pa-5">
               <v-btn
                 color="warning"
-                @click="step_number = 1"
+                @click="step_number = Math.max(step_number - 1, 1)"
               >
                 Return
               </v-btn>
@@ -539,6 +539,7 @@ export default Vue.extend({
           message: undefined,
           done: false,
           skip: false,
+          started: false,
         },
       ]
     },
@@ -651,7 +652,7 @@ export default Vue.extend({
         .catch((error) => `Failed to fetch available firmware: ${error.message ?? error.response?.data}.`)
     },
     validateParams(): boolean {
-      return this.$refs.param_loader.validateParams()
+      return this.$refs.param_loader?.validateParams()
     },
   },
 })