diff --git a/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js b/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js
index cd8b36203..c8b1a626d 100644
--- a/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js
+++ b/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js
@@ -12,10 +12,9 @@ const withSiteId = routes.withSiteId;
 
 const NoSessionsMessage = () => {
   const { projectsStore } = useStore();
-  const sites = projectsStore.list;
   const siteId = projectsStore.siteId;
   const history = useHistory();
-  const activeSite = sites.find((s) => s.id === siteId);
+  const activeSite = projectsStore.active;
   const showNoSessions = !!activeSite && !activeSite.recorded;
   const onboardingPath = withSiteId(onboardingRoute('installing'), siteId);
 
diff --git a/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx b/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
index f818a83eb..2ede00e77 100644
--- a/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
+++ b/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
@@ -76,8 +76,8 @@ function SessionList() {
   const fetchStatus = async () => {
     const response = await sessionService.getRecordingStatus();
     setStatusData({
-      status: response.recording_status,
-      count: response.sessions_count
+      status: response.recordingStatus,
+      count: response.sessionsCount
     });
   };