diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js
index b1be7dafb..d3d1e40a8 100644
--- a/graph/loaders/assets.js
+++ b/graph/loaders/assets.js
@@ -71,9 +71,7 @@ const findByUrl = async (context, asset_url) => {
     throw errors.ErrInvalidAssetURL;
   }
 
-  let asset = await AssetsService.findByUrl(asset_url);
-
-  return asset;
+  return AssetsService.findByUrl(asset_url);
 };
 
 /**
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index d608316b0..8bb9d31d3 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -53,11 +53,10 @@ const RootQuery = {
     }
 
     if (asset_url) {
-      return Assets.findByUrl(asset_url)
-        .then((asset) => {
-          const newQuery = Object.assign({}, query, {asset_id: asset.id});
-          return Comments.getCountByQuery(newQuery);
-        });
+      let asset = await Assets.findByUrl(asset_url);
+      if (asset) {
+        query.asset_id = asset.id;
+      }
     }
 
     return Comments.getCountByQuery(query);