From 28a8b5b401bcd78e11a56fb0a9b0d4eda537c404 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Tue, 13 Oct 2020 15:49:56 -0400
Subject: [PATCH] [MM-29615] Fixed subscription page so it doesn't load until
 subscription info is loaded (#6766)

---
 components/admin_console/billing/billing_subscriptions.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/admin_console/billing/billing_subscriptions.tsx b/components/admin_console/billing/billing_subscriptions.tsx
index 95c7952a2647..8d6ef611e29b 100644
--- a/components/admin_console/billing/billing_subscriptions.tsx
+++ b/components/admin_console/billing/billing_subscriptions.tsx
@@ -168,6 +168,10 @@ const BillingSubscriptions: React.FC<Props> = () => {
         </div>
     );
 
+    if (!subscription) {
+        return null;
+    }
+
     return (
         <div className='wrapper--fixed BillingSubscriptions'>
             <FormattedAdminHeader