but

frontend/src/pages/addresses/Addresses.jsx

@@ -95,11 +95,9 @@ export default function Addresses() {
         />
       )}
 
-      {!atLimit && (
-        <div className="mb-xl">
-          <AddressForm onSubmit={handleAddressSubmit} />
-        </div>
-      )}
+      <div className={`mb-xl${atLimit ? " tier-locked" : ""}`}>
+        <AddressForm onSubmit={handleAddressSubmit} />
+      </div>
 
       <div>
         <h2>Existing Tracked Addresses</h2>

frontend/src/pages/alerts/Alerts.jsx

@@ -382,12 +382,10 @@ export default function Alerts() {
                 />
               )}
 
-              {!atAlertLimit && (
-                <div className="mb-xl">
-                  <h3>Create New Alert</h3>
-                  <AlertForm onSubmit={handleAlertSubmit} />
-                </div>
-              )}
+              <div className={`mb-xl${atAlertLimit ? " tier-locked" : ""}`}>
+                <h3>Create New Alert</h3>
+                <AlertForm onSubmit={handleAlertSubmit} />
+              </div>
 
               <div>
                 <h3>Active Alert Rules</h3>

frontend/src/pages/subscribe/Subscribe.jsx

@@ -34,6 +34,7 @@ export default function Subscribe() {
   const [searchParams, setSearchParams] = useSearchParams();
 
   const hasPaymentReturn = searchParams.get("payment") === "success";
+  const isUpgrade = searchParams.get("upgrade") === "true";
   const [step, setStep] = useState(hasPaymentReturn || currentUser ? 2 : 1);
   const [loading, setLoading] = useState(hasPaymentReturn);
   const [error, setError] = useState("");
@@ -69,7 +70,7 @@ export default function Subscribe() {
   const tierLimits = TIER_LIMITS[data.selectedTier] || TIER_LIMITS.free;
 
   useEffect(() => {
-    if (!currentUser) return;
+    if (!currentUser || isUpgrade) return;
     getAddresses()
       .then((addresses) => {
         if (addresses.length > 0) {
@@ -77,7 +78,7 @@ export default function Subscribe() {
         }
       })
       .catch(() => { });
-  }, [currentUser, navigate]);
+  }, [currentUser, navigate, isUpgrade]);
 
   useEffect(() => {
     const payment = searchParams.get("payment");