diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 7825ad7b..845c6372 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -39,14 +39,17 @@ async def pkgbase(request: Request, name: str) -> Response:
     # Get the PackageBase.
     pkgbase = get_pkg_or_base(name, PackageBase)
 
-    # If this is not a split package, redirect to /packages/{name}.
-    if pkgbase.packages.count() == 1:
-        return RedirectResponse(f"/packages/{name}",
+    # Redirect to /packages if there's only one related Package
+    # and its name matches its PackageBase.
+    packages = pkgbase.packages.all()
+    pkg = packages[0]
+    if len(packages) == 1 and pkg.Name == pkgbase.Name:
+        return RedirectResponse(f"/packages/{pkg.Name}",
                                 status_code=int(HTTPStatus.SEE_OTHER))
 
     # Add our base information.
     context = pkgbaseutil.make_context(request, pkgbase)
-    context["packages"] = pkgbase.packages.all()
+    context["packages"] = packages
 
     return render_template(request, "pkgbase/index.html", context)