diff --git a/frontend/src/contexts/AuthContext.jsx b/frontend/src/contexts/AuthContext.jsx
index 269bd94..3505bc6 100644
--- a/frontend/src/contexts/AuthContext.jsx
+++ b/frontend/src/contexts/AuthContext.jsx
@@ -79,7 +79,9 @@ export function AuthProvider({ children }) {
     if (auth.currentUser) {
       await auth.currentUser.reload();
       setCurrentUser({ ...auth.currentUser });
+      return auth.currentUser;
     }
+    return null;
   }
 
   const value = {
diff --git a/frontend/src/pages/subscribe/Subscribe.jsx b/frontend/src/pages/subscribe/Subscribe.jsx
index 10c151d..38e201c 100644
--- a/frontend/src/pages/subscribe/Subscribe.jsx
+++ b/frontend/src/pages/subscribe/Subscribe.jsx
@@ -82,10 +82,7 @@ export default function Subscribe() {
     setError("");
     setLoading(true);
     try {
-      await reloadUser();
-      const { currentUser: user } = await import("../../firebase/config").then(
-        (m) => ({ currentUser: m.auth.currentUser })
-      );
+      const user = await reloadUser();
       if (user?.emailVerified) {
         setStep(3);
       } else {