diff --git a/next.config.js b/next.config.js
index ee56eaaa..d2427d45 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,8 @@
+/** used to transpile UMD and CJS modules */
 const withTM = require('next-transpile-modules')(['ramda']);
 
 module.exports = withTM({
-  /* Your Next.js config */
+  /** rewrite old-style node paths */
   async rewrites() {
     return [
       {
@@ -10,4 +11,7 @@ module.exports = withTM({
       },
     ];
   },
+
+  /** don't try to optimize fonts */
+  optimizeFonts: false,
 });
diff --git a/src/containers/node/NodeComments/index.tsx b/src/containers/node/NodeComments/index.tsx
index 3877b58d..cf550136 100644
--- a/src/containers/node/NodeComments/index.tsx
+++ b/src/containers/node/NodeComments/index.tsx
@@ -27,7 +27,11 @@ const NodeComments: FC<IProps> = memo(({ order }) => {
     onSaveComment,
   } = useCommentContext();
 
-  const groupped: ICommentGroup[] = useGrouppedComments(comments, order, lastSeenCurrent);
+  const groupped: ICommentGroup[] = useGrouppedComments(
+    comments,
+    order,
+    lastSeenCurrent ?? undefined
+  );
 
   const more = useMemo(
     () =>