diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
index 352ccc842f438b8e0b8a3c48e59dc2ffcf4f2666..fc407e2632a5be254bb766401537d11ed8796dd4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
@@ -124,11 +124,11 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
         } else {
             $name = $this->arguments['name'] ?? '';
         }
-        if ($this->hasArgument('value') && is_object($this->arguments['value'])) {
-            // @todo Use  $this->persistenceManager->isNewObject() once it is implemented
-            if ($this->persistenceManager->getIdentifierByObject($this->arguments['value']) !== null) {
-                $name .= '[__identity]';
-            }
+        if ($this->hasArgument('value') &&
+            is_object($this->arguments['value']) &&
+            !$this->persistenceManager->isNewObject($this->arguments['value'])
+        ) {
+            $name .= '[__identity]';
         }
         return (string)$name;
     }