diff --git a/docs/api/PLAN_PAYWALL_INTERFACE.md b/docs/api/PLAN_PAYWALL_INTERFACE.md
index 1f9cfb7de..9f0a3d098 100644
--- a/docs/api/PLAN_PAYWALL_INTERFACE.md
+++ b/docs/api/PLAN_PAYWALL_INTERFACE.md
@@ -1,6 +1,6 @@
 # Plan Paywall Interface
 
-Component that restricts access to its content until if member does not have access to the required plans.
+Component that restricts access to its content unless the member has one of the access plans.
 
 ## Architecture
 
@@ -15,7 +15,7 @@ The root container that provides plan paywall context to all child components.
 **Props**
 ```tsx
 interface PlanPaywallServiceConfig {
-  requiredPlanIds: string[];
+  accessPlanIds: string[];
   memberOrders?: orders.Order[];
 }
 
@@ -28,7 +28,7 @@ interface RootProps {
 **Example**
 ```tsx
 // Restrict by specific plan ids
-<PlanPaywall.Root planPaywallServiceConfig={{ requiredPlanIds: ['planId'] }}>
+<PlanPaywall.Root planPaywallServiceConfig={{ accessPlanIds: ['planId'] }}>
   <PlanPaywall.Paywall>
     <PlanPaywall.RestrictedContent>
       <div>Paywalled content</div>
@@ -45,7 +45,7 @@ interface RootProps {
 // Load member orders externally
 const { memberOrders } = await loadPlanPaywallServiceConfig(['planId']);
 
-<PlanPaywall.Root planPaywallServiceConfig={{ memberOrders: memberOrders, requiredPlanIds: ['planId'] }}>
+<PlanPaywall.Root planPaywallServiceConfig={{ memberOrders: memberOrders, accessPlanIds: ['planId'] }}>
   {/* Plan paywall components */}
 </PlanPaywall.Root>
 ```
@@ -61,6 +61,13 @@ interface PaywallProps {
   children: AsChildChildren<PlanPaywallData> | React.ReactNode;
   loadingState?: React.ReactNode;
 }
+
+interface PlanPaywallData {
+  isLoading: boolean;
+  error: string | null;
+  hasAccess: boolean;
+  isLoggedIn: boolean;
+}
 ```
 
 **Example**
@@ -72,7 +79,7 @@ interface PaywallProps {
 
 // With asChild
 <PlanPaywall.Paywall asChild>
-  {React.forwardRef(({isLoading, error, hasAccess}, ref) => {
+  {React.forwardRef(({isLoading, error, hasAccess, isLoggedIn}, ref) => {
     if (isLoading) {
       return <div>Loading...</div>;
     }
@@ -81,6 +88,10 @@ interface PaywallProps {
       return <div>Error: {error.message}</div>;
     }
 
+    if (!isLoggedIn) {
+      return <div>Please log in to access this content</div>;
+    }
+
     if (hasAccess) {
       return <div>Paywalled content</div>;
     }
@@ -89,14 +100,11 @@ interface PaywallProps {
   })}
 </PlanPaywall.Paywall>
 ```
-
-**Data Attributes**
-- `data-testid="plan-paywall-paywall"` - Applied to paywall element
 ---
 
 ### PlanPaywall.RestrictedContent
 
-Component that displays the restricted content if the member has access to the required plans.
+Component that displays the restricted content if the member has one of the access plans.
 
 **Props**
 ```tsx
@@ -115,19 +123,34 @@ interface RestrictedContentProps {
 
 ### PlanPaywall.Fallback
 
-Component that displays the fallback content if the member does not have access to the required plans.
+Component that displays the fallback content if the member does not have any of the access plans.
 
 **Props**
 ```tsx
 interface FallbackProps {
-  children: React.ReactNode;
+  asChild?: boolean;
+  children:
+    | AsChildChildren<{ accessPlanIds: string[]; isLoggedIn: boolean }>
+    | React.ReactNode;
 }
 ```
 
 **Example**
 ```tsx
+// Default usage
 <PlanPaywall.Fallback>
-  <div>You need to buy a plan to access this content</div>
+  <div>Fallback content</div>
+</PlanPaywall.Fallback>
+
+// With asChild with react component
+<PlanPaywall.Fallback asChild>
+  {React.forwardRef(({accessPlanIds, isLoggedIn}, ref) => {
+    if (!isLoggedIn) {
+      return <div ref={ref}>Please log in to access this content</div>;
+    }
+
+    return <div ref={ref}>You need to buy one of the following plans to access this content: {accessPlanIds.join(', ')}</div>;
+  })}
 </PlanPaywall.Fallback>
 ```
 ---
@@ -146,6 +169,9 @@ interface ErrorComponentProps {
 
 **Example**
 ```tsx
+// Default usage
+<PlanPaywall.ErrorComponent />
+
 // With asChild
 <PlanPaywall.ErrorComponent asChild>
   <div>There was an error checking member access</div>
@@ -160,3 +186,7 @@ interface ErrorComponentProps {
   ))}
 </PlanPaywall.ErrorComponent>
 ```
+
+**Data Attributes**
+- `data-testid="plan-paywall-error-component"` - Applied to error component
+---
diff --git a/examples/astro-pricing-plans-demo/src/components/CoursePageComponent.tsx b/examples/astro-pricing-plans-demo/src/components/CoursePageComponent.tsx
index 99fcb95ca..df14469dc 100644
--- a/examples/astro-pricing-plans-demo/src/components/CoursePageComponent.tsx
+++ b/examples/astro-pricing-plans-demo/src/components/CoursePageComponent.tsx
@@ -3,7 +3,10 @@ import { useWixClient } from '../hooks/useWixClient';
 import { getLevelBadgeClass } from '../utils/course-utils';
 import { PlanCardContent } from './PlanCard';
 import type { Course } from '../utils/demo-courses';
-import { PricingPlans } from '@wix/headless-pricing-plans/react';
+import {
+  PricingPlans,
+  type PlanPaywallFallbackData,
+} from '@wix/headless-pricing-plans/react';
 
 interface CoursePageComponentProps {
   course: Course;
@@ -17,7 +20,7 @@ export const CoursePageComponent = (props: CoursePageComponentProps) => {
     return (
       <PricingPlans.PlanPaywall.Root
         planPaywallServiceConfig={{
-          requiredPlanIds: props.course.accessedByPlanIds,
+          accessPlanIds: props.course.accessedByPlanIds,
         }}
       >
         <PricingPlans.PlanPaywall.Paywall>
@@ -25,7 +28,16 @@ export const CoursePageComponent = (props: CoursePageComponentProps) => {
             <CourseData {...props} />
           </PricingPlans.PlanPaywall.RestrictedContent>
           <PricingPlans.PlanPaywall.Fallback>
-            <RestrictedCourseFallback course={props.course} />
+            {React.forwardRef<HTMLDivElement, PlanPaywallFallbackData>(
+              ({ accessPlanIds, isLoggedIn }, ref) => (
+                <RestrictedCourseFallback
+                  course={props.course}
+                  ref={ref}
+                  accessPlanIds={accessPlanIds}
+                  isLoggedIn={isLoggedIn}
+                />
+              ),
+            )}
           </PricingPlans.PlanPaywall.Fallback>
         </PricingPlans.PlanPaywall.Paywall>
       </PricingPlans.PlanPaywall.Root>
@@ -35,11 +47,11 @@ export const CoursePageComponent = (props: CoursePageComponentProps) => {
   return <CourseData {...props} />;
 };
 
-const RestrictedCourseFallback: React.FC<CoursePageComponentProps> = ({
-  course,
-}) => {
-  const { getIsLoggedIn, login, logout } = useWixClient();
-  const [isLoggedIn] = useState<boolean>(getIsLoggedIn());
+const RestrictedCourseFallback = React.forwardRef<
+  HTMLDivElement,
+  PlanPaywallFallbackData & { course: Course }
+>(({ course, isLoggedIn, accessPlanIds }, ref) => {
+  const { login, logout } = useWixClient();
 
   const authLinkText = isLoggedIn ? 'Logout' : 'Login';
 
@@ -52,7 +64,10 @@ const RestrictedCourseFallback: React.FC<CoursePageComponentProps> = ({
   };
 
   return (
-    <div className="min-h-screen bg-gradient-to-br from-amber-50 via-orange-50 to-yellow-50">
+    <div
+      ref={ref}
+      className="min-h-screen bg-gradient-to-br from-amber-50 via-orange-50 to-yellow-50"
+    >
       {/* Navigation */}
       <nav className="bg-white/80 backdrop-blur-md border-b border-primary-100 sticky top-0 z-50 shadow-subtle">
         <div className="container mx-auto px-6 py-4">
@@ -184,8 +199,7 @@ const RestrictedCourseFallback: React.FC<CoursePageComponentProps> = ({
           <div className="max-w-6xl mx-auto text-center">
             <PricingPlans.PlanList.Root
               planListServiceConfig={{
-                // TODO: Don't render plans if user has access to the course
-                planIds: course.accessedByPlanIds || [],
+                planIds: accessPlanIds,
               }}
             >
               <PricingPlans.PlanList.Plans
@@ -216,7 +230,7 @@ const RestrictedCourseFallback: React.FC<CoursePageComponentProps> = ({
       </main>
     </div>
   );
-};
+});
 
 const CourseData: React.FC<CoursePageComponentProps> = ({ course }) => {
   const { getIsLoggedIn, login, logout } = useWixClient();
diff --git a/examples/astro-pricing-plans-demo/src/components/CoursesPageComponent.tsx b/examples/astro-pricing-plans-demo/src/components/CoursesPageComponent.tsx
index 482f5f638..3b210bf2f 100644
--- a/examples/astro-pricing-plans-demo/src/components/CoursesPageComponent.tsx
+++ b/examples/astro-pricing-plans-demo/src/components/CoursesPageComponent.tsx
@@ -327,7 +327,7 @@ const CoursesPageComponent: React.FC = () => {
                 <PricingPlans.PlanPaywall.Root
                   key={course.id}
                   planPaywallServiceConfig={{
-                    requiredPlanIds: course.accessedByPlanIds,
+                    accessPlanIds: course.accessedByPlanIds,
                   }}
                 >
                   <PricingPlans.PlanPaywall.Paywall>
diff --git a/packages/headless-components/pricing-plans/package.json b/packages/headless-components/pricing-plans/package.json
index 731b94a6d..c37739be2 100644
--- a/packages/headless-components/pricing-plans/package.json
+++ b/packages/headless-components/pricing-plans/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-pricing-plans",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "type": "module",
   "scripts": {
     "prebuild": "cd ../utils && yarn build && cd ../components && yarn build && cd ../media && yarn build",
diff --git a/packages/headless-components/pricing-plans/src/react/PlanPaywall.tsx b/packages/headless-components/pricing-plans/src/react/PlanPaywall.tsx
index 72e061ffc..6be82f7e8 100644
--- a/packages/headless-components/pricing-plans/src/react/PlanPaywall.tsx
+++ b/packages/headless-components/pricing-plans/src/react/PlanPaywall.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { AsChildChildren, AsChildSlot } from '@wix/headless-utils/react';
 import { PlanPaywallServiceConfig } from '../services/index.js';
 import {
@@ -7,7 +8,6 @@ import {
 } from './core/PlanPaywall.js';
 
 enum PlanPaywallTestId {
-  Paywall = 'plan-paywall-paywall',
   ErrorComponent = 'plan-paywall-error',
 }
 
@@ -22,7 +22,7 @@ interface RootProps {
  * @component
  * @example
  * ```tsx
- * <PlanPaywall.Root planPaywallServiceConfig={{ requiredPlanIds: ['planId'] }}>
+ * <PlanPaywall.Root planPaywallServiceConfig={{ accessPlanIds: ['planId'] }}>
  *   <PlanPaywall.Paywall>
  *     <PlanPaywall.RestrictedContent>
  *       <div>Paywalled content</div>
@@ -69,7 +69,7 @@ interface PaywallProps {
  *
  * // With asChild
  * <PlanPaywall.Paywall asChild>
- *   {React.forwardRef(({isLoading, error, hasAccess}, ref) => {
+ *   {React.forwardRef(({isLoading, error, hasAccess, isLoggedIn}, ref) => {
  *     if (isLoading) {
  *       return loadingState;
  *     }
@@ -78,6 +78,10 @@ interface PaywallProps {
  *       return <div>Error!</div>;
  *     }
  *
+ *     if (!isLoggedIn) {
+ *       return <div>Please log in to access this content</div>;
+ *     }
+ *
  *     if (hasAccess) {
  *       return <div>Paywalled content</div>;
  *     }
@@ -94,14 +98,8 @@ export const Paywall = ({ asChild, children, loadingState }: PaywallProps) => (
         asChild={asChild}
         customElement={children}
         customElementProps={paywallData}
-        data-testid={PlanPaywallTestId.Paywall}
-        data-is-loading={paywallData.isLoading}
-        data-has-error={paywallData.error !== null}
-        data-has-access={paywallData.hasAccess}
       >
-        <div>
-          {paywallData.isLoading ? loadingState : (children as React.ReactNode)}
-        </div>
+        {paywallData.isLoading ? loadingState : (children as React.ReactNode)}
       </AsChildSlot>
     )}
   </CorePaywall>
@@ -112,7 +110,7 @@ interface RestrictedContentProps {
 }
 
 /**
- * Component that displays the restricted content if the member has access to the required plans.
+ * Component that displays the restricted content if the member has one of the access plans.
  *
  * @component
  * @example
@@ -125,21 +123,27 @@ interface RestrictedContentProps {
 export const RestrictedContent = ({ children }: RestrictedContentProps) => (
   <CorePaywall>
     {({ hasAccess, isLoading, error }) => {
-      if (isLoading || !!error) {
+      if (isLoading || !!error || !hasAccess) {
         return null;
       }
 
-      return hasAccess ? children : null;
+      return children;
     }}
   </CorePaywall>
 );
 
+export type PlanPaywallFallbackData = Pick<
+  PlanPaywallData,
+  'accessPlanIds' | 'isLoggedIn'
+>;
+
 interface FallbackProps {
-  children: React.ReactNode;
+  asChild?: boolean;
+  children: AsChildChildren<PlanPaywallFallbackData> | React.ReactNode;
 }
 
 /**
- * Component that displays the fallback content if the member does not have access to the required plans.
+ * Component that displays the fallback content if the member does not have any of the access plans.
  *
  * @component
  * @example
@@ -147,23 +151,49 @@ interface FallbackProps {
  * <PlanPaywall.Fallback>
  *   <div>Fallback content</div>
  * </PlanPaywall.Fallback>
+ *
+ * // With asChild with react component
+ * <PlanPaywall.Fallback asChild>
+ *   {React.forwardRef(({accessPlanIds, isLoggedIn}, ref) => {
+ *     if (!isLoggedIn) {
+ *       return <div ref={ref}>Please log in to access this content</div>;
+ *     }
+ *
+ *     return <div ref={ref}>You need to buy one of the following plans to access this content: {accessPlanIds.join(', ')}</div>;
+ *   })}
+ * </PlanPaywall.Fallback>
  * ```
  */
-export const Fallback = ({ children }: FallbackProps) => (
-  <CorePaywall>
-    {({ hasAccess, error, isLoading }) => {
-      if (isLoading || !!error) {
-        return null;
-      }
+export const Fallback = React.forwardRef<HTMLElement, FallbackProps>(
+  ({ asChild, children }, ref) => (
+    <CorePaywall>
+      {({ hasAccess, error, isLoading, isLoggedIn, accessPlanIds }) => {
+        if (isLoading || !!error || hasAccess) {
+          return null;
+        }
 
-      return hasAccess ? null : children;
-    }}
-  </CorePaywall>
+        return (
+          <AsChildSlot
+            ref={ref}
+            asChild={asChild}
+            customElement={children}
+            customElementProps={
+              { accessPlanIds, isLoggedIn } satisfies PlanPaywallFallbackData
+            }
+          >
+            {children}
+          </AsChildSlot>
+        );
+      }}
+    </CorePaywall>
+  ),
 );
 
+export type PlanPaywallErrorData = Pick<PlanPaywallData, 'error'>;
+
 interface ErrorComponentProps {
   asChild?: boolean;
-  children: AsChildChildren<{ error: string }> | React.ReactNode;
+  children: AsChildChildren<PlanPaywallErrorData> | React.ReactNode;
   className?: string;
 }
 
@@ -191,11 +221,10 @@ interface ErrorComponentProps {
  * </PlanPaywall.ErrorComponent>
  * ```
  */
-export const ErrorComponent = ({
-  asChild,
-  children,
-  className,
-}: ErrorComponentProps) => (
+export const ErrorComponent = React.forwardRef<
+  HTMLElement,
+  ErrorComponentProps
+>(({ asChild, children, className }, ref) => (
   <CorePaywall>
     {({ error }) => {
       if (!error) {
@@ -204,9 +233,10 @@ export const ErrorComponent = ({
 
       return (
         <AsChildSlot
+          ref={ref}
           asChild={asChild}
           customElement={children}
-          customElementProps={{ error }}
+          customElementProps={{ error } satisfies PlanPaywallErrorData}
           data-testid={PlanPaywallTestId.ErrorComponent}
           className={className}
         >
@@ -215,4 +245,4 @@ export const ErrorComponent = ({
       );
     }}
   </CorePaywall>
-);
+));
diff --git a/packages/headless-components/pricing-plans/src/react/core/PlanPaywall.tsx b/packages/headless-components/pricing-plans/src/react/core/PlanPaywall.tsx
index 6ca66e8a1..e955f5282 100644
--- a/packages/headless-components/pricing-plans/src/react/core/PlanPaywall.tsx
+++ b/packages/headless-components/pricing-plans/src/react/core/PlanPaywall.tsx
@@ -29,6 +29,8 @@ export interface PaywallData {
   isLoading: boolean;
   error: string | null;
   hasAccess: boolean;
+  isLoggedIn: boolean;
+  accessPlanIds: string[];
 }
 
 interface PaywallProps {
@@ -36,12 +38,17 @@ interface PaywallProps {
 }
 
 export function Paywall({ children }: PaywallProps) {
-  const { isLoadingSignal, errorSignal, hasAccessSignal } = useService(
-    PlanPaywallServiceDefinition,
-  );
+  const {
+    isLoadingSignal,
+    errorSignal,
+    hasAccessSignal,
+    isLoggedInSignal,
+    accessPlanIds,
+  } = useService(PlanPaywallServiceDefinition);
   const isLoading = isLoadingSignal.get();
   const error = errorSignal.get();
   const hasAccess = hasAccessSignal.get();
+  const isLoggedIn = isLoggedInSignal.get();
 
-  return children({ isLoading, error, hasAccess });
+  return children({ isLoading, error, hasAccess, isLoggedIn, accessPlanIds });
 }
diff --git a/packages/headless-components/pricing-plans/src/react/index.ts b/packages/headless-components/pricing-plans/src/react/index.ts
index cd1373510..fb4e9e0e5 100644
--- a/packages/headless-components/pricing-plans/src/react/index.ts
+++ b/packages/headless-components/pricing-plans/src/react/index.ts
@@ -16,6 +16,11 @@ export type {
   PlanDescriptionData,
 } from './Plan.js';
 
+export type {
+  PlanPaywallFallbackData,
+  PlanPaywallErrorData,
+} from './PlanPaywall.js';
+
 export const PricingPlans = {
   Plan,
   PlanList,
diff --git a/packages/headless-components/pricing-plans/src/services/plan-paywall-service.ts b/packages/headless-components/pricing-plans/src/services/plan-paywall-service.ts
index 1126e53b6..aa04689fa 100644
--- a/packages/headless-components/pricing-plans/src/services/plan-paywall-service.ts
+++ b/packages/headless-components/pricing-plans/src/services/plan-paywall-service.ts
@@ -15,10 +15,12 @@ export const PlanPaywallServiceDefinition = defineService<{
   isLoadingSignal: ReadOnlySignal<boolean>;
   errorSignal: ReadOnlySignal<string | null>;
   hasAccessSignal: ReadOnlySignal<boolean>;
+  isLoggedInSignal: ReadOnlySignal<boolean>;
+  accessPlanIds: string[];
 }>('planPaywallService');
 
 export interface PlanPaywallServiceConfig {
-  requiredPlanIds: string[];
+  accessPlanIds: string[];
   memberOrders?: orders.Order[];
 }
 
@@ -33,6 +35,8 @@ export const PlanPaywallService =
       const signalsService = getService(SignalsServiceDefinition);
       const isLoadingSignal = signalsService.signal<boolean>(false);
       const errorSignal = signalsService.signal<string | null>(null);
+      const isLoggedInSignal =
+        signalsService.signal<boolean>(isMemberLoggedIn());
       const memberOrdersSignal = signalsService.signal<orders.Order[] | null>(
         config.memberOrders ?? null,
       );
@@ -43,7 +47,7 @@ export const PlanPaywallService =
           const activePlanOrders = memberOrders.filter(
             (order) =>
               order.status === 'ACTIVE' &&
-              config.requiredPlanIds.includes(order.planId!),
+              config.accessPlanIds.includes(order.planId!),
           );
           return activePlanOrders.length > 0;
         }
@@ -51,20 +55,21 @@ export const PlanPaywallService =
       });
 
       if (!config.memberOrders) {
-        loadMemberOrders(config.requiredPlanIds);
+        loadMemberOrders(config.accessPlanIds);
       }
 
-      async function loadMemberOrders(requiredPlanIds: string[]) {
+      async function loadMemberOrders(accessPlanIds: string[]) {
         try {
           isLoadingSignal.set(true);
           errorSignal.set(null);
           const isLoggedIn = isMemberLoggedIn();
+          isLoggedInSignal.set(isLoggedIn);
           if (!isLoggedIn) {
             memberOrdersSignal.set(null);
             return;
           }
 
-          const memberOrders = await fetchMemberOrders(requiredPlanIds);
+          const memberOrders = await fetchMemberOrders(accessPlanIds);
           memberOrdersSignal.set(memberOrders);
         } catch (error) {
           errorSignal.set(
@@ -81,6 +86,8 @@ export const PlanPaywallService =
         isLoadingSignal,
         errorSignal,
         hasAccessSignal,
+        isLoggedInSignal,
+        accessPlanIds: config.accessPlanIds,
       };
     },
   );
@@ -106,12 +113,12 @@ function isMemberLoggedIn(): boolean {
 }
 
 export async function loadPlanPaywallServiceConfig(
-  requiredPlanIds: string[],
+  accessPlanIds: string[],
 ): Promise<PlanPaywallServiceConfig> {
   if (!isMemberLoggedIn()) {
-    return { memberOrders: [], requiredPlanIds };
+    return { memberOrders: [], accessPlanIds };
   }
 
-  const memberOrders = await fetchMemberOrders(requiredPlanIds);
-  return { memberOrders: memberOrders ?? [], requiredPlanIds };
+  const memberOrders = await fetchMemberOrders(accessPlanIds);
+  return { memberOrders: memberOrders ?? [], accessPlanIds };
 }