diff --git a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
index ff62a899a..b7ecce906 100644
--- a/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
+++ b/frontend/app/components/Assist/components/AssistTabs/AssistTabs.tsx
@@ -13,17 +13,21 @@ const AssistTabs = (props: Props) => {
   return (
     <div className="relative mr-4">
       <div className="flex items-center">
-        <div
-          className={stl.btnLink}
-          onClick={() => setShowMenu(!showMenu)}
-        >
-          More Live Sessions
-        </div>
-        <span className="mx-3 color-gray-medium">by</span>
-        <div className="flex items-center">
-          <Icon name="user-alt" color="gray-darkest" />
-          <div className="ml-2">{props.userId}</div>
-        </div>
+        {props.userId && (
+          <>
+            <div
+              className={stl.btnLink}
+              onClick={() => setShowMenu(!showMenu)}
+            >
+              More Live Sessions
+            </div>
+            <span className="mx-3 color-gray-medium">by</span>
+            <div className="flex items-center">
+              <Icon name="user-alt" color="gray-darkest" />
+              <div className="ml-2">{props.userId}</div>
+            </div>
+          </>
+        )}
       </div>
       <SlideModal
         title={ <div>Live Sessions by {props.userId}</div> }
diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricsWidgets.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricsWidgets.tsx
index fcb8eedb1..6cf633518 100644
--- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricsWidgets.tsx
+++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricsWidgets.tsx
@@ -4,6 +4,7 @@ import { fetchList } from 'Duck/customMetrics';
 import CustomMetricWidget from './CustomMetricWidget';
 import AlertFormModal from 'App/components/Alerts/AlertFormModal';
 import { init as initAlert } from 'Duck/alerts';
+import LazyLoad from 'react-lazyload';
 
 interface Props {
   fetchList: Function;
@@ -22,15 +23,17 @@ function CustomMetricsWidgets(props: Props) {
   return (
     <>
       {list.filter(item => item.active).map((item: any) => (
-        <CustomMetricWidget
-          key={item.metricId}
-          metric={item}
-          onClickEdit={props.onClickEdit}
-          onAlertClick={(e) => {
-            setActiveMetricId(item.metricId)
-            props.initAlert({ query: { left: item.series.first().seriesId }})
-          }}
-        />
+        <LazyLoad>
+          <CustomMetricWidget
+            key={item.metricId}
+            metric={item}
+            onClickEdit={props.onClickEdit}
+            onAlertClick={(e) => {
+              setActiveMetricId(item.metricId)
+              props.initAlert({ query: { left: item.series.first().seriesId }})
+            }}
+          />
+        </LazyLoad>
       ))}
 
       <AlertFormModal