diff --git a/src/modules/useJoyrideData.ts b/src/modules/useJoyrideData.ts
index a07f070e..fcd968e0 100644
--- a/src/modules/useJoyrideData.ts
+++ b/src/modules/useJoyrideData.ts
@@ -346,12 +346,12 @@ export default function useJoyrideData(
       });
     }
 
-    if (previousStep && changedState('status', [STATUS.FINISHED, STATUS.SKIPPED])) {
+    if (changedState('status', [STATUS.FINISHED, STATUS.SKIPPED])) {
       callback?.({
         ...state,
-        index: index - 1,
+        index: previousStep ? index - 1 : 0,
         // Return the last step when the tour is finished
-        step: previousStep,
+        step: previousStep ?? step,
         type: EVENTS.TOUR_END,
       });
       store.current.reset();