diff --git a/.changeset/duplicated-history-push.md b/.changeset/duplicated-history-push.md
new file mode 100644
index 000000000..e7d9f4e32
--- /dev/null
+++ b/.changeset/duplicated-history-push.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+Fix duplicated push history
diff --git a/src/data/events.ts b/src/data/events.ts
index a966e7760..655aa3a08 100644
--- a/src/data/events.ts
+++ b/src/data/events.ts
@@ -68,7 +68,7 @@ export function setupNativeEvents(
         resolve: false,
         replace: a.hasAttribute("replace"),
         scroll: !a.hasAttribute("noscroll"),
-        state: state && JSON.parse(state)
+        state: state ? JSON.parse(state) : undefined
       });
     }