diff --git a/.changeset/curly-pants-fry.md b/.changeset/curly-pants-fry.md
new file mode 100644
index 0000000..509f4f2
--- /dev/null
+++ b/.changeset/curly-pants-fry.md
@@ -0,0 +1,5 @@
+---
+'stplr': patch
+---
+
+fix payload state logic, introduced Vitest and unit tests
diff --git a/.changeset/few-panthers-hammer.md b/.changeset/few-panthers-hammer.md
new file mode 100644
index 0000000..25d4ddb
--- /dev/null
+++ b/.changeset/few-panthers-hammer.md
@@ -0,0 +1,5 @@
+---
+'stplr-core': patch
+---
+
+fix payload state logic
diff --git a/.changeset/pre.json b/.changeset/pre.json
index ed5e4c5..06ba1fd 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -13,7 +13,9 @@
     "clean-frogs-poke",
     "cuddly-cups-itch",
     "curly-ligers-cheat",
+    "curly-pants-fry",
     "famous-donkeys-compete",
+    "few-panthers-hammer",
     "few-parrots-switch",
     "five-students-care",
     "four-boats-confess",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 8070ef0..c188835 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # stplr
 
+## 0.1.0-alpha.35
+
+### Patch Changes
+
+- fix payload state logic, introduced Vitest and unit tests
+
 ## 0.1.0-alpha.34
 
 ### Minor Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index fb80d14..f94ff73 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stplr",
-  "version": "0.1.0-alpha.34",
+  "version": "0.1.0-alpha.35",
   "main": "./dist/index.mjs",
   "bin": {
     "stplr": "./dist/index.mjs"
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 4c45dd8..379d99e 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # stplr-core
 
+## 0.2.0-alpha.18
+
+### Patch Changes
+
+- fix payload state logic
+
 ## 0.2.0-alpha.17
 
 ### Minor Changes
diff --git a/packages/core/installMachine/index.ts b/packages/core/installMachine/index.ts
index e10a5fb..18f5791 100644
--- a/packages/core/installMachine/index.ts
+++ b/packages/core/installMachine/index.ts
@@ -117,7 +117,11 @@ const createInstallMachine = (initialContext: InstallMachineContext) => {
         installSupabase: {
           always: [
             {
-              guard: and([isStepCompleted('installSupabase'), 'shouldInstallPayload']),
+              guard: and([
+                isStepCompleted('installSupabase'),
+                not(isStepCompleted('installPayload')),
+                'shouldInstallPayload',
+              ]),
               target: 'installPayload',
             },
             {
@@ -128,7 +132,13 @@ const createInstallMachine = (initialContext: InstallMachineContext) => {
           invoke: {
             input: ({ context }) => context,
             src: 'installSupabaseActor',
-            onDone: [{ guard: 'shouldInstallPayload', target: 'installPayload' }, { target: 'createDocFiles' }],
+            onDone: [
+              {
+                guard: and(['shouldInstallPayload', not(isStepCompleted('installPayload'))]),
+                target: 'installPayload',
+              },
+              { target: 'createDocFiles' },
+            ],
             onError: 'failed',
           },
         },
diff --git a/packages/core/package.json b/packages/core/package.json
index 2e4b520..376c931 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stplr-core",
-  "version": "0.2.0-alpha.17",
+  "version": "0.2.0-alpha.18",
   "private": true,
   "main": "./dist/index.js",
   "scripts": {