diff --git a/frontend/src/scenes/insights/InsightHistoryPanel/InsightHistoryPanel.tsx b/frontend/src/scenes/insights/InsightHistoryPanel/InsightHistoryPanel.tsx
index 228b5b01849..3c437b1c25f 100644
--- a/frontend/src/scenes/insights/InsightHistoryPanel/InsightHistoryPanel.tsx
+++ b/frontend/src/scenes/insights/InsightHistoryPanel/InsightHistoryPanel.tsx
@@ -125,7 +125,7 @@ export const InsightHistoryPanel: React.FC<InsightHistoryPanelProps> = ({ displa
     const { reportInsightHistoryItemClicked } = useActions(eventUsageLogic)
 
     const [activeTab, setActiveTab] = useState(
-        insights?.length < 3 && teamInsights?.length > insights?.length
+        !insightsLoading && insights?.length < 3 && teamInsights?.length > insights?.length
             ? InsightHistoryType.TEAM
             : InsightHistoryType.RECENT
     )
diff --git a/frontend/src/scenes/onboarding/home/sections/DiscoverInsight.tsx b/frontend/src/scenes/onboarding/home/sections/DiscoverInsight.tsx
index 80d1b3aca8e..0071d55525d 100644
--- a/frontend/src/scenes/onboarding/home/sections/DiscoverInsight.tsx
+++ b/frontend/src/scenes/onboarding/home/sections/DiscoverInsight.tsx
@@ -181,9 +181,7 @@ export function DiscoverInsightsModule(): JSX.Element {
             </Title>
             <Divider />
             <Skeleton
-                loading={
-                    (insightsLoading && insights.length === 0) || (teamInsightsLoading && teamInsights.length === 0)
-                }
+                loading={insightsLoading && insights.length === 0 && teamInsightsLoading && teamInsights.length === 0}
             >
                 <Space direction={'vertical'} className={'home-page'} size={'small'}>
                     {(insights.length > 0 || teamInsights.length > 0) && <RecentInsightList />}