diff --git a/system/src/Grav/Framework/Flex/FlexForm.php b/system/src/Grav/Framework/Flex/FlexForm.php
index 3d379618d..7aef23c2a 100644
--- a/system/src/Grav/Framework/Flex/FlexForm.php
+++ b/system/src/Grav/Framework/Flex/FlexForm.php
@@ -45,9 +45,10 @@ class FlexForm implements FlexFormInterface
     {
         $this->name = $name;
         $this->form = $form;
+        $uniqueId = $object->exists() ? $object->getStorageKey() : "{$object->getType()}:new";
         $this->setObject($object);
         $this->setId($this->getName());
-        $this->setUniqueId(md5($this->getObject()->getStorageKey()));
+        $this->setUniqueId(md5($uniqueId));
         $this->errors = [];
         $this->submitted = false;