diff --git a/config/watcher.ts b/config/watcher.ts
index 9ff074e51..89da62bf6 100644
--- a/config/watcher.ts
+++ b/config/watcher.ts
@@ -13,7 +13,7 @@ const config: Config = {
         "core/client/stream/**/*.ts",
         "core/client/stream/**/*.tsx",
         "core/client/stream/**/*.graphql",
-        "core/client/server/**/*.graphql",
+        "core/server/**/*.graphql",
       ],
       ignore: [
         "core/**/*.d.ts",
diff --git a/src/core/client/stream/components/Stream.spec.tsx b/src/core/client/stream/components/Stream.spec.tsx
index 5d9c81bdf..05d30d66e 100644
--- a/src/core/client/stream/components/Stream.spec.tsx
+++ b/src/core/client/stream/components/Stream.spec.tsx
@@ -18,19 +18,6 @@ it("renders correctly", () => {
   expect(wrapper).toMatchSnapshot();
 });
 
-it("renders when comments is null", () => {
-  const props = {
-    assetID: "asset-id",
-    isClosed: false,
-    comments: null,
-    onLoadMore: noop,
-    disableLoadMore: false,
-    hasMore: false,
-  };
-  const wrapper = shallow(<Stream {...props} />);
-  expect(wrapper).toMatchSnapshot();
-});
-
 describe("when there is more", () => {
   const props = {
     assetID: "asset-id",
diff --git a/src/core/client/stream/components/Stream.tsx b/src/core/client/stream/components/Stream.tsx
index 87f0670dd..a14816453 100644
--- a/src/core/client/stream/components/Stream.tsx
+++ b/src/core/client/stream/components/Stream.tsx
@@ -12,17 +12,13 @@ import Logo from "./Logo";
 export interface StreamProps {
   assetID: string;
   isClosed: boolean;
-  comments: ReadonlyArray<{ id: string }> | null;
+  comments: ReadonlyArray<{ id: string }>;
   onLoadMore: () => void;
   hasMore: boolean;
   disableLoadMore: boolean;
 }
 
 const Stream: StatelessComponent<StreamProps> = props => {
-  if (props.comments === null) {
-    // TODO: (@cvle) What's the reason for this being null?
-    return <div>Comments unavailable</div>;
-  }
   return (
     <div>
       <Logo gutterBottom />
diff --git a/src/core/client/stream/containers/StreamContainer.tsx b/src/core/client/stream/containers/StreamContainer.tsx
index 9f13938b4..d81319deb 100644
--- a/src/core/client/stream/containers/StreamContainer.tsx
+++ b/src/core/client/stream/containers/StreamContainer.tsx
@@ -22,9 +22,7 @@ export class StreamContainer extends React.Component<InnerProps> {
   };
 
   public render() {
-    const comments = this.props.asset.comments
-      ? this.props.asset.comments.edges.map(edge => edge.node)
-      : null;
+    const comments = this.props.asset.comments.edges.map(edge => edge.node);
     return (
       <Stream
         assetID={this.props.asset.id}
diff --git a/src/core/server/graph/tenant/schema/schema.graphql b/src/core/server/graph/tenant/schema/schema.graphql
index b3bfb94eb..1f4e3957b 100644
--- a/src/core/server/graph/tenant/schema/schema.graphql
+++ b/src/core/server/graph/tenant/schema/schema.graphql
@@ -305,7 +305,7 @@ type Asset {
     first: Int = 10
     orderBy: COMMENT_SORT = CREATED_AT_DESC
     after: Cursor
-  ): CommentsConnection
+  ): CommentsConnection!
 
   """
   author is the authors listed in the meta tags for the Asset.