diff --git a/src/components/boris/BorisStatsGit/index.tsx b/src/components/boris/BorisStatsGit/index.tsx
index 030699a3..5daa22f8 100644
--- a/src/components/boris/BorisStatsGit/index.tsx
+++ b/src/components/boris/BorisStatsGit/index.tsx
@@ -9,8 +9,6 @@ interface IProps {
 }
 
 const BorisStatsGit: FC<IProps> = ({ stats }) => {
-  if (!stats.issues.length) return null;
-
   const open = useMemo(
     () => stats.issues.filter(el => !el.pull_request && el.state === 'open').slice(0, 5),
     [stats.issues]
@@ -21,6 +19,8 @@ const BorisStatsGit: FC<IProps> = ({ stats }) => {
     [stats.issues]
   );
 
+  if (!stats.issues.length) return null;
+
   if (stats.is_loading) {
     return (
       <>
diff --git a/src/components/boris/BorisStatsGitCard/index.tsx b/src/components/boris/BorisStatsGitCard/index.tsx
index 20f4d469..4b5148f3 100644
--- a/src/components/boris/BorisStatsGitCard/index.tsx
+++ b/src/components/boris/BorisStatsGitCard/index.tsx
@@ -14,10 +14,10 @@ const stateLabels: Record<IGithubIssue['state'], string> = {
 };
 
 const BorisStatsGitCard: FC<IProps> = ({ data: { created_at, title, html_url, state } }) => {
-  if (!title || !created_at) return null;
-
   const date = useMemo(() => getPrettyDate(created_at), [created_at]);
 
+  if (!title || !created_at) return null;
+
   return (
     <div className={styles.wrap}>
       <div className={styles.time}>
diff --git a/src/components/boris/Superpower/index.tsx b/src/components/boris/Superpower/index.tsx
index 01d08f75..1864c677 100644
--- a/src/components/boris/Superpower/index.tsx
+++ b/src/components/boris/Superpower/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC, memo } from 'react';
+import React, { FC } from 'react';
 import { useShallowSelect } from '~/utils/hooks/useShallowSelect';
 import { selectAuthIsTester, selectUser } from '~/redux/auth/selectors';
 
diff --git a/src/layouts/BorisLayout/index.tsx b/src/layouts/BorisLayout/index.tsx
index 6a97617a..00a422d7 100644
--- a/src/layouts/BorisLayout/index.tsx
+++ b/src/layouts/BorisLayout/index.tsx
@@ -4,7 +4,7 @@ import { Group } from '~/components/containers/Group';
 import boris from '~/sprites/boris_robot.svg';
 import { Container } from '~/containers/main/Container';
 import StickyBox from 'react-sticky-box/dist/esnext';
-import { BorisComments } from '~/components/boris/BorisComments';
+import { BorisComments } from '~/views/boris/BorisComments';
 import { Card } from '~/components/containers/Card';
 import { SidebarRouter } from '~/containers/main/SidebarRouter';
 import { BorisSidebar } from '~/components/boris/BorisSidebar';
diff --git a/src/components/boris/BorisComments/index.tsx b/src/views/boris/BorisComments/index.tsx
similarity index 100%
rename from src/components/boris/BorisComments/index.tsx
rename to src/views/boris/BorisComments/index.tsx
diff --git a/src/components/boris/BorisComments/styles.module.scss b/src/views/boris/BorisComments/styles.module.scss
similarity index 100%
rename from src/components/boris/BorisComments/styles.module.scss
rename to src/views/boris/BorisComments/styles.module.scss