diff --git a/app/assets/javascripts/preferences/panes/AccountPreferences.tsx b/app/assets/javascripts/preferences/panes/AccountPreferences.tsx
index 90161807a..706e984c7 100644
--- a/app/assets/javascripts/preferences/panes/AccountPreferences.tsx
+++ b/app/assets/javascripts/preferences/panes/AccountPreferences.tsx
@@ -32,6 +32,7 @@ export const AccountPreferences = observer(
       <PreferencesPane>
         <Credentials application={application} />
         <Sync application={application} />
+        <SubscriptionWrapper application={application} />
         <SignOutWrapper application={application} appState={appState} />
       </PreferencesPane>
     );
diff --git a/app/assets/javascripts/preferences/panes/account/subscription/Subscription.tsx b/app/assets/javascripts/preferences/panes/account/subscription/Subscription.tsx
index 780af8c8c..c9d41dfe3 100644
--- a/app/assets/javascripts/preferences/panes/account/subscription/Subscription.tsx
+++ b/app/assets/javascripts/preferences/panes/account/subscription/Subscription.tsx
@@ -21,7 +21,7 @@ export const Subscription: FunctionComponent<Props> = observer(({
   application,
   subscriptionState,
 }: Props) => {
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
   const [error, setError] = useState(false);
 
   const { userSubscription } = subscriptionState;
@@ -59,8 +59,10 @@ export const Subscription: FunctionComponent<Props> = observer(({
   }, [getSubscription, getSubscriptions]);
 
   useEffect(() => {
-    getSubscriptionInfo();
-  }, [getSubscriptionInfo]);
+    if (application.hasAccount()) {
+      getSubscriptionInfo();
+    }
+  }, [application, getSubscriptionInfo]);
 
   const now = new Date().getTime();
 
@@ -71,7 +73,7 @@ export const Subscription: FunctionComponent<Props> = observer(({
           <div className="flex-grow flex flex-col">
             <Title>Subscription</Title>
             {error ? (
-              <NoSubscription application={application} />
+              <Text>No subscription information available.</Text>
             ) : loading ? (
               <Text>Loading subscription information...</Text>
             ) : userSubscription && userSubscription.endsAt > now ? (