diff --git a/screenpipe-app-tauri/components/cli-command-dialog.tsx b/screenpipe-app-tauri/components/cli-command-dialog.tsx
index 01c661203..d377bf45b 100644
--- a/screenpipe-app-tauri/components/cli-command-dialog.tsx
+++ b/screenpipe-app-tauri/components/cli-command-dialog.tsx
@@ -9,6 +9,7 @@ import {
   DialogTitle,
 } from "./ui/dialog";
 import { CodeBlock } from "./ui/codeblock";
+import usePlatform from '@/lib/hooks/use-platform';
 import { useCopyToClipboard } from "@/lib/hooks/use-copy-to-clipboard";
 import { useToast } from "@/components/ui/use-toast";
 import { IconCode } from "./ui/icons";
@@ -138,7 +139,10 @@ export function CliCommandDialog({ settings }: CliCommandDialogProps) {
             </DialogDescription>
           </DialogHeader>
           <div className="overflow-x-auto">
-            <CodeBlock language="bash" value={generateCliCommand()} />
+            <CodeBlock
+              language={usePlatform() === "windows" ? "cmd" : "bash"}
+              value={generateCliCommand()}
+            />
           </div>
           <DialogFooter>
             <Button onClick={handleCopyCliCommand}>Copy to Clipboard</Button>
diff --git a/screenpipe-app-tauri/components/dev-mode-settings.tsx b/screenpipe-app-tauri/components/dev-mode-settings.tsx
index f932d1036..15b793507 100644
--- a/screenpipe-app-tauri/components/dev-mode-settings.tsx
+++ b/screenpipe-app-tauri/components/dev-mode-settings.tsx
@@ -3,6 +3,7 @@ import React, { useState } from "react";
 
 import { CodeBlock } from "@/components/ui/codeblock";
 import { platform } from "@tauri-apps/plugin-os";
+import usePlatform from '@/lib/hooks/use-platform';
 import { Label } from "./ui/label";
 import { Switch } from "./ui/switch";
 import { useSettings } from "@/lib/hooks/use-settings";
@@ -270,7 +271,7 @@ export const DevModeSettings = ({ localDataDir }: { localDataDir: string }) => {
             thru CLI 👇
           </p>
           <CodeBlock
-            language="bash"
+            language={usePlatform() === "windows" ? "cmd" : "bash"}
             value={getDebuggingCommands(platform(), localDataDir)}
           />
 
diff --git a/screenpipe-app-tauri/components/onboarding/dev-configuration.tsx b/screenpipe-app-tauri/components/onboarding/dev-configuration.tsx
index d20530e93..2ed987b07 100644
--- a/screenpipe-app-tauri/components/onboarding/dev-configuration.tsx
+++ b/screenpipe-app-tauri/components/onboarding/dev-configuration.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react";
 import { ArrowUpRight } from "lucide-react";
 import { open } from "@tauri-apps/plugin-shell";
 import { platform } from "@tauri-apps/plugin-os";
+import usePlatform from '@/lib/hooks/use-platform';
 import { CodeBlock } from "@/components/onboarding/single-codeblock";
 import { DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import OnboardingNavigation from "@/components/onboarding/navigation";
@@ -125,7 +126,7 @@ const OnboardingDevConfig: React.FC<OnboardingDevConfigProps> = ({
                   </p>
                   <CodeBlock
                     className="rounded-md mt-2"
-                    language="bash"
+                    language={usePlatform() === "windows" ? "cmd" : "bash"}
                     value={instructions.command}
                   />
                 </li>
diff --git a/screenpipe-app-tauri/lib/hooks/use-platform.tsx b/screenpipe-app-tauri/lib/hooks/use-platform.tsx
new file mode 100644
index 000000000..c02cf2f4f
--- /dev/null
+++ b/screenpipe-app-tauri/lib/hooks/use-platform.tsx
@@ -0,0 +1,17 @@
+import { useState, useEffect } from 'react';
+import { platform } from '@tauri-apps/plugin-os';
+
+const usePlatform = () => {
+  const [os, setOs] = useState<string | null>(null);
+
+  useEffect(() => {
+    (async () => {
+      const osPlatform = await platform();
+      setOs(osPlatform);
+    })();
+  }, []);
+
+  return os;
+};
+
+export default usePlatform;