diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ea63b41..9e6b73ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: [ "8.1", "8.2", "8.3" ]
-                symfony: ["^5.4", "^6.4"]
+                symfony: [ "^6.4" ]
                 sylius: [ "~1.13.0", "~1.14.0" ]
                 node: [ "18.x", "20.x" ]
                 mysql: ["8.0"]
@@ -40,7 +40,7 @@ jobs:
 
         steps:
             -
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -
                 name: Setup PHP
diff --git a/.github/workflows/coding_standard.yml b/.github/workflows/coding_standard.yml
index ac6ee615..ebf75396 100644
--- a/.github/workflows/coding_standard.yml
+++ b/.github/workflows/coding_standard.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ "8.1", "8.2", "8.3" ]
-        symfony: [ "^5.4", "^6.4" ]
+        symfony: [ "^6.4" ]
         sylius: [ "^1.13", "^1.14" ]
         node: [ "18.x", "20.x" ]
 
diff --git a/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php b/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php
index 10eebee1..7e9ddb6e 100644
--- a/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php
+++ b/spec/CommandHandler/Wishlist/CreateNewWishlistHandlerSpec.php
@@ -70,6 +70,7 @@ public function it_creates_new_wishlist_for_user(
         $tokenUserResolver->resolve($token)->willReturn($shopUser);
 
         $wishlistCookieTokenResolver->resolve()->willReturn('token');
+        $wishlistCookieTokenResolver->new()->willReturn('token');
         $wishlistFactory->createForUser($shopUser)->willReturn($wishlist);
 
         $wishlist->getShopUser()->willReturn($shopUser);
@@ -141,6 +142,7 @@ public function it_doesnt_add_duplicated_wishlist_name_for_user(
         $tokenUserResolver->resolve($token)->willReturn($shopUser);
 
         $wishlistCookieTokenResolver->resolve()->willReturn('token');
+        $wishlistCookieTokenResolver->new()->willReturn('token');
         $wishlistFactory->createForUser($shopUser)->willReturn($wishlist);
 
         $wishlist->getShopUser()->willReturn($shopUser);
diff --git a/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php b/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php
index e785f7fe..63616d82 100644
--- a/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php
+++ b/src/CommandHandler/Wishlist/CreateNewWishlistHandler.php
@@ -58,7 +58,11 @@ public function __invoke(CreateNewWishlist $createNewWishlist): int
         }
 
         if ('' !== $wishlistCookieToken) {
-            $wishlist->setToken($wishlistCookieToken);
+            if ($user instanceof ShopUserInterface) {
+                $wishlist->setToken($this->wishlistCookieTokenResolver->new());
+            } else {
+                $wishlist->setToken($wishlistCookieToken);
+            }
         }
 
         if (null !== $createNewWishlist->getChannelCode()) {
diff --git a/src/Resolver/WishlistCookieTokenResolver.php b/src/Resolver/WishlistCookieTokenResolver.php
index d6229fdb..a73d23a2 100644
--- a/src/Resolver/WishlistCookieTokenResolver.php
+++ b/src/Resolver/WishlistCookieTokenResolver.php
@@ -43,4 +43,9 @@ public function resolve(): string
 
         return (string) new WishlistToken();
     }
+
+    public function new(): string
+    {
+        return (string) new WishlistToken();
+    }
 }
diff --git a/src/Resolver/WishlistCookieTokenResolverInterface.php b/src/Resolver/WishlistCookieTokenResolverInterface.php
index d9d62386..573b9c53 100644
--- a/src/Resolver/WishlistCookieTokenResolverInterface.php
+++ b/src/Resolver/WishlistCookieTokenResolverInterface.php
@@ -14,4 +14,6 @@
 interface WishlistCookieTokenResolverInterface
 {
     public function resolve(): string;
+
+    public function new(): string;
 }