diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index fd505e299..2a7057cca 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -105,7 +105,7 @@ class Embed extends Component {
         loading ? <Spinner/>
       : <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
-            <Tab><Count count={asset.comments.length}/></Tab>
+            <Tab><Count count={asset.commentCount}/></Tab>
             <Tab>Settings</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
diff --git a/client/coral-framework/graphql/queries/streamQuery.graphql b/client/coral-framework/graphql/queries/streamQuery.graphql
index 77f8ed356..583a2db13 100644
--- a/client/coral-framework/graphql/queries/streamQuery.graphql
+++ b/client/coral-framework/graphql/queries/streamQuery.graphql
@@ -17,6 +17,7 @@ query AssetQuery($asset_url: String!) {
             charCount
             requireEmailConfirmation
         }
+        commentCount
         comments {
             ...commentView
             replies {
diff --git a/client/coral-plugin-stream/Stream.js b/client/coral-plugin-stream/Stream.js
index 2ec84af24..633a98502 100644
--- a/client/coral-plugin-stream/Stream.js
+++ b/client/coral-plugin-stream/Stream.js
@@ -73,6 +73,7 @@ query AssetQuery($asset_id: ID!) {
     id
     title
     url
+    commentCount
     comments {
       ...commentView
       replies {
diff --git a/graph/loaders/util.js b/graph/loaders/util.js
index dbfcdedfd..4640d8245 100644
--- a/graph/loaders/util.js
+++ b/graph/loaders/util.js
@@ -72,9 +72,9 @@ class SharedCacheDataLoader extends DataLoader {
   constructor(prefix, expiry, batchLoadFn, options) {
     super(SharedCacheDataLoader.batchLoadFn(prefix, expiry, batchLoadFn), options);
 
-    this._keyFunc = SharedCacheDataLoader.keyFunc(this._prefix);
     this._prefix = prefix;
     this._expiry = expiry;
+    this._keyFunc = SharedCacheDataLoader.keyFunc(this._prefix);
   }
 
   /**