diff --git a/manage_subscriptions/views.py b/manage_subscriptions/views.py
index 752cea0..55fac46 100644
--- a/manage_subscriptions/views.py
+++ b/manage_subscriptions/views.py
@@ -690,20 +690,13 @@ class ActiveSubscriptionView(TemplateView):
         request = self.request
         today = timezone.now().date()
         if request.user.is_authenticated:
-            active_subscription = (
-                PrincipalSubscription.objects.filter(
-                    principal=request.user,
-                    is_paid=True,
-                    cancelled=False,
-                    deleted=False,
-                    active=True,
-                    status=SubscriptionStatus.ACTIVE,
-                )
-                .select_related("principal")  # Optimize query
-                .order_by("-grace_period_end_date")
-                .first()
-            )
-            context["active_subscription"] = active_subscription
+            latest_subscription = PrincipalSubscription.objects.filter(
+                principal=request.user,
+                is_paid=True,
+                deleted=False,
+                end_date__gte=today,
+            ).order_by('-end_date').last()
+            context["active_subscription"] = latest_subscription
         return context