diff --git a/src/core/client/stream/queries/CommentsCountQuery.tsx b/src/core/client/stream/queries/CommentsCountQuery.tsx
index be2a034f7..f589a26fc 100644
--- a/src/core/client/stream/queries/CommentsCountQuery.tsx
+++ b/src/core/client/stream/queries/CommentsCountQuery.tsx
@@ -18,6 +18,7 @@ interface InnerProps extends PropTypesOf<typeof Tab> {
 class CommentsCountQuery extends Component<InnerProps> {
   public render() {
     const { assetID, assetURL } = this.props.local;
+    const { local: _, ...rest } = this.props;
     return (
       <QueryRenderer<QueryTypes>
         query={graphql`
@@ -42,7 +43,7 @@ class CommentsCountQuery extends Component<InnerProps> {
             return (
               <CommentCountTab
                 commentCount={props.asset.commentCounts.totalVisible}
-                {...this.props}
+                {...rest}
               />
             );
           }
diff --git a/src/core/common/config.ts b/src/core/common/config.ts
index 972ac9b83..e02e44558 100644
--- a/src/core/common/config.ts
+++ b/src/core/common/config.ts
@@ -37,7 +37,7 @@ const config = convict({
   enable_graphiql: {
     doc: "When true, this will enable the GraphiQL routes",
     format: Boolean,
-    default: true,
+    default: false,
     env: "ENABLE_GRAPHIQL",
     arg: "enableGraphiQL",
   },