diff --git a/apinf_packages/api_catalog/client/grid/grid.html b/apinf_packages/api_catalog/client/grid/grid.html
index 4b7c5bb4ad..62ac8c1f4f 100644
--- a/apinf_packages/api_catalog/client/grid/grid.html
+++ b/apinf_packages/api_catalog/client/grid/grid.html
@@ -5,16 +5,20 @@
 
 <template name="apiCatalogGrid">
   <div class="row">
-    {{#if apis.length}}
-      {{# each api in apis }}
-        <div class="col-grid col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
-          {{> apiCard api=api organization=organization }}
+    {{# if Template.subscriptionsReady }}
+      {{# if apis.length }}
+        {{# each api in apis }}
+          <div class="col-grid col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
+            {{> apiCard api=api organization=organization }}
+          </div>
+        {{/ each }}
+      {{ else }}
+        <div class="col-xs-12">
+          <p>
+            {{_ 'apiCatalog_noApis_Found' }}
+          </p>
         </div>
-      {{/ each }}
-    {{else}}
-      <div class="col-xs-12">
-        <p>{{_ 'apiCatalog_noApis_Found'}}</p>
-      </div>
-    {{/if}}
+      {{/ if }}
+    {{/ if }}
   </div>
 </template>