diff --git a/tools/static-assets/skel-typescript/imports/ui/Info.tsx b/tools/static-assets/skel-typescript/imports/ui/Info.tsx
index 3bcf685386..23cb8f07a3 100644
--- a/tools/static-assets/skel-typescript/imports/ui/Info.tsx
+++ b/tools/static-assets/skel-typescript/imports/ui/Info.tsx
@@ -1,16 +1,19 @@
-import React from 'react';
-import { useTracker } from 'meteor/react-meteor-data';
-import { LinksCollection, Link } from '../api/links';
+import React from "react";
+import { useFind, useSubscribe } from "meteor/react-meteor-data";
+import { LinksCollection, Link } from "../api/links";
 
 export const Info = () => {
-  const links = useTracker(() => {
-    return LinksCollection.find().fetch();
-  });
+  const isLoading = useSubscribe("links");
+  const links = useFind(() => LinksCollection.find());
+
+  if (isLoading()) {
+    return <div>Loading...</div>;
+  }
 
   const makeLink = (link: Link) => {
     return (
-      <li key={link._id}>
-        <a href={link.url} target="_blank">{link.title}</a>
+      <li key={ link._id }>
+        <a href={ link.url } target="_blank">{ link.title }</a>
       </li>
     );
   }
@@ -18,7 +21,7 @@ export const Info = () => {
   return (
     <div>
       <h2>Learn Meteor!</h2>
-      <ul>{links.map(makeLink)}</ul>
+      <ul>{ links.map(makeLink) }</ul>
     </div>
   );
 };