diff --git a/ui/desktop/src/components/sessions/SessionsInsights.tsx b/ui/desktop/src/components/sessions/SessionsInsights.tsx
index 84ebb69f7b..e42302b3f2 100644
--- a/ui/desktop/src/components/sessions/SessionsInsights.tsx
+++ b/ui/desktop/src/components/sessions/SessionsInsights.tsx
@@ -10,6 +10,7 @@ import { Button } from '../ui/button';
 import { ChatSmart } from '../icons/';
 import { motion, AnimatePresence } from 'framer-motion';
 import { Goose } from '../icons/Goose';
+import { Skeleton } from '../ui/skeleton';
 
 interface SessionInsightsType {
   totalSessions: number;
@@ -114,8 +115,113 @@ export function SessionInsights() {
       .replace(/\//g, '/');
   };
 
+  // Render skeleton loader while data is loading
+  const renderSkeleton = () => (
+    <div className="bg-background-muted flex flex-col h-full">
+      {/* Header container with rounded bottom */}
+      <div className="bg-background-default rounded-b-2xl mb-0.5">
+        <div className="px-8 pb-12 pt-19 space-y-4">
+          <motion.div
+            initial={{ opacity: 0, scale: 0.25, x: -5, y: 5, rotate: -20 }}
+            animate={{ opacity: 1, scale: 1, x: 0, y: 0, rotate: 0 }}
+            transition={{ type: 'spring', stiffness: 300, damping: 25 }}
+            className="origin-bottom-left"
+          >
+            <Goose className="size-8" />
+          </motion.div>
+          <Greeting />
+        </div>
+      </div>
+
+      {/* Stats containers - full bleed with 2px gaps */}
+      <div className="flex flex-col flex-1 space-y-0.5">
+        {/* Top row with three equal columns */}
+        <div className="grid grid-cols-3 gap-0.5">
+          {/* Total Sessions Card Skeleton */}
+          <Card className="w-full py-6 px-6 border-none rounded-2xl bg-background-default">
+            <CardContent className="flex flex-col justify-end h-full p-0">
+              <div className="flex flex-col justify-end">
+                <Skeleton className="h-10 w-16 mb-1" />
+                <span className="text-xs text-text-muted">Total sessions</span>
+              </div>
+            </CardContent>
+          </Card>
+
+          {/* Average Duration Card Skeleton */}
+          <Card className="w-full py-6 px-6 border-none rounded-2xl bg-background-default">
+            <CardContent className="flex flex-col justify-end h-full p-0">
+              <div className="flex flex-col justify-end">
+                <Skeleton className="h-10 w-20 mb-1" />
+                <span className="text-xs text-text-muted">Avg. chat length</span>
+              </div>
+            </CardContent>
+          </Card>
+
+          {/* Total Tokens Card Skeleton */}
+          <Card className="w-full py-6 px-6 border-none rounded-2xl bg-background-default">
+            <CardContent className="flex flex-col justify-end h-full p-0">
+              <div className="flex flex-col justify-end">
+                <Skeleton className="h-10 w-24 mb-1" />
+                <span className="text-xs text-text-muted">Total tokens</span>
+              </div>
+            </CardContent>
+          </Card>
+        </div>
+
+        {/* Recent Chats Card Skeleton */}
+        <div className="grid grid-cols-1 gap-0.5">
+          <Card className="w-full py-6 px-6 border-none rounded-2xl bg-background-default">
+            <CardContent className="p-0">
+              <div className="flex justify-between items-center mb-4">
+                <CardDescription className="mb-0">
+                  <span className="text-lg text-text-default">Recent chats</span>
+                </CardDescription>
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="text-xs text-text-muted flex items-center gap-1 !px-0 hover:bg-transparent hover:underline hover:text-text-default"
+                  onClick={navigateToSessionHistory}
+                >
+                  See all
+                </Button>
+              </div>
+              <div className="space-y-3 min-h-[96px]">
+                {/* Skeleton chat items */}
+                <div className="flex items-center justify-between py-1 px-2">
+                  <div className="flex items-center space-x-2">
+                    <Skeleton className="h-4 w-4 rounded-sm" />
+                    <Skeleton className="h-4 w-48" />
+                  </div>
+                  <Skeleton className="h-4 w-16" />
+                </div>
+                <div className="flex items-center justify-between py-1 px-2">
+                  <div className="flex items-center space-x-2">
+                    <Skeleton className="h-4 w-4 rounded-sm" />
+                    <Skeleton className="h-4 w-40" />
+                  </div>
+                  <Skeleton className="h-4 w-16" />
+                </div>
+                <div className="flex items-center justify-between py-1 px-2">
+                  <div className="flex items-center space-x-2">
+                    <Skeleton className="h-4 w-4 rounded-sm" />
+                    <Skeleton className="h-4 w-52" />
+                  </div>
+                  <Skeleton className="h-4 w-16" />
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </div>
+
+        {/* Filler container - extends to fill remaining space */}
+        <div className="bg-background-default rounded-2xl flex-1"></div>
+      </div>
+    </div>
+  );
+
+  // Show skeleton while loading, then show actual content
   if (!insights) {
-    return <></>;
+    return renderSkeleton();
   }
 
   return (
diff --git a/ui/desktop/src/components/settings/models/ModelsSection.tsx b/ui/desktop/src/components/settings/models/ModelsSection.tsx
index f4abf1fa18..9d665d5b27 100644
--- a/ui/desktop/src/components/settings/models/ModelsSection.tsx
+++ b/ui/desktop/src/components/settings/models/ModelsSection.tsx
@@ -16,12 +16,14 @@ interface ModelsSectionProps {
 export default function ModelsSection({ setView }: ModelsSectionProps) {
   const [provider, setProvider] = useState<string | null>(null);
   const [displayModelName, setDisplayModelName] = useState<string>('');
+  const [isLoading, setIsLoading] = useState<boolean>(true);
   const { read, getProviders } = useConfig();
   const { getCurrentModelDisplayName, getCurrentProviderDisplayName } = useModelAndProvider();
 
   // Function to load model data
   const loadModelData = useCallback(async () => {
     try {
+      setIsLoading(true);
       const gooseProvider = (await read('GOOSE_PROVIDER', false)) as string;
       const providers = await getProviders(true);
 
@@ -50,6 +52,8 @@ export default function ModelsSection({ setView }: ModelsSectionProps) {
       }
     } catch (error) {
       console.error('Error loading model data:', error);
+    } finally {
+      setIsLoading(false);
     }
   }, [read, getProviders, getCurrentModelDisplayName, getCurrentProviderDisplayName]);
 
@@ -62,8 +66,17 @@ export default function ModelsSection({ setView }: ModelsSectionProps) {
     <section id="models" className="space-y-4 pr-4">
       <Card className="p-2 pb-4">
         <CardContent className="px-2">
-          <h3 className="text-text-default">{displayModelName}</h3>
-          <h4 className="text-xs text-text-muted">{provider}</h4>
+          {isLoading ? (
+            <>
+              <div className="h-[20px] mb-1"></div>
+              <div className="h-[16px]"></div>
+            </>
+          ) : (
+            <div className="animate-in fade-in duration-100">
+              <h3 className="text-text-default">{displayModelName}</h3>
+              <h4 className="text-xs text-text-muted">{provider}</h4>
+            </div>
+          )}
           <ModelSettingsButtons setView={setView} />
         </CardContent>
       </Card>