From 63a33e32e637c16895dbc4fdb4fb8c0473e0eb5c Mon Sep 17 00:00:00 2001
From: "Brian I. Kim" <il.kim@liferay.com>
Date: Thu, 27 Feb 2025 21:14:03 -0800
Subject: [PATCH] LPD-50195 Return Guest Account immediately.

---
 .../commerce/internal/util/CommerceAccountHelperImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
index ffb89d6c9e68d0..1eb6b4fc582e89 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
@@ -366,6 +366,14 @@ public AccountEntry getCurrentAccountEntry(
 		}
 
 		if (accountEntry != null) {
+			if (accountEntry.isGuestAccount()) {
+				setCurrentCommerceAccount(
+					httpServletRequest, commerceChannelGroupId,
+					AccountConstants.ACCOUNT_ENTRY_ID_GUEST);
+
+				return accountEntry;
+			}
+
 			CommerceChannelAccountEntryRel commerceChannelAccountEntryRel =
 				_commerceChannelAccountEntryRelLocalService.
 					fetchCommerceChannelAccountEntryRel(