diff --git a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
index ce4133bfb8913..5f0dd26d6bc15 100644
--- a/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
+++ b/app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php
@@ -88,7 +88,10 @@ private function updateCookieFormKey($formKey)
             ->createPublicCookieMetadata();
         $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
         $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
-        $cookieMetadata->setDuration($this->sessionConfig->getCookieLifetime());
+        $lifetime = $this->sessionConfig->getCookieLifetime();
+        if ($lifetime !== 0) {
+            $cookieMetadata->setDuration($lifetime);
+        }
 
         $this->cookieFormKey->set(
             $formKey,