diff --git a/src/lib/components/admin/Settings/Integrations.svelte b/src/lib/components/admin/Settings/Integrations.svelte
index 131c7ab392..e094baaf60 100644
--- a/src/lib/components/admin/Settings/Integrations.svelte
+++ b/src/lib/components/admin/Settings/Integrations.svelte
@@ -119,7 +119,7 @@
 	const addTerminalConnection = (server: TerminalConnection) => {
 		terminalConnections = [
 			...terminalConnections,
-			{ ...server, id: server.id ?? crypto.randomUUID?.() ?? uuidv4() }
+			{ ...server, id: server.id ?? uuidv4() }
 		];
 		saveTerminalServers();
 	};
diff --git a/src/lib/components/playground/Chat.svelte b/src/lib/components/playground/Chat.svelte
index 3b0a73d3de..44d7211386 100644
--- a/src/lib/components/playground/Chat.svelte
+++ b/src/lib/components/playground/Chat.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { v4 as uuidv4 } from 'uuid';
 	import fileSaver from 'file-saver';
 	const { saveAs } = fileSaver;
 
@@ -224,7 +225,7 @@
 
 		// Add system message if present
 		if (system) {
-			const systemId = crypto.randomUUID();
+			const systemId = uuidv4();
 			messagesMap[systemId] = {
 				id: systemId,
 				parentId: null,
@@ -238,7 +239,7 @@
 
 		// Add conversation messages
 		for (const msg of messages) {
-			const msgId = crypto.randomUUID();
+			const msgId = uuidv4();
 
 			// Link parent to child
 			if (parentId && messagesMap[parentId]) {
diff --git a/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte b/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
index 8cd7a3b6f8..b5ab8bdf69 100644
--- a/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
+++ b/src/lib/components/workspace/Models/VoiceAvatarEditor.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { v4 as uuidv4 } from 'uuid';
 	import { getContext, onDestroy } from 'svelte';
 	import {
 		AVATAR_MAX_BYTES,
@@ -39,7 +40,7 @@
 			error = $i18n.t('Choose a VRMA file, up to 10 MiB.');
 			return;
 		}
-		const id = crypto.randomUUID();
+		const id = uuidv4();
 		animationFiles = { ...animationFiles, [id]: selected };
 		if (typeof animationTarget === 'number') {
 			value = {
diff --git a/src/lib/components/workspace/Skills.svelte b/src/lib/components/workspace/Skills.svelte
index 6358c2228b..af68d29b61 100644
--- a/src/lib/components/workspace/Skills.svelte
+++ b/src/lib/components/workspace/Skills.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { v4 as uuidv4 } from 'uuid';
 	import WorkspaceAccessModal from './common/WorkspaceAccessModal.svelte';
 	let accessModal: WorkspaceAccessModal;
 	import { resolveLocalizedResource } from '$lib/utils/localizedContent';
@@ -251,7 +252,7 @@
 
 	const cloneHandler = async (skill) => {
 		try {
-			const suffix = crypto.randomUUID().slice(0, 7);
+			const suffix = uuidv4().slice(0, 7);
 			const result = await cloneSkill(
 				localStorage.token,
 				skill.id,
diff --git a/src/lib/components/workspace/Skills/SkillEditor.svelte b/src/lib/components/workspace/Skills/SkillEditor.svelte
index 8185ea02c7..0dcb25a386 100644
--- a/src/lib/components/workspace/Skills/SkillEditor.svelte
+++ b/src/lib/components/workspace/Skills/SkillEditor.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { v4 as uuidv4 } from 'uuid';
 	import { onMount, tick, getContext } from 'svelte';
 
 	import { toast } from 'svelte-sonner';
@@ -204,7 +205,7 @@
 	};
 	const saveCopy = async () => {
 		try {
-			const suffix = crypto.randomUUID().slice(0, 7);
+			const suffix = uuidv4().slice(0, 7);
 			const result = await createNewSkill(localStorage.token, {
 				id: `${id}-${suffix}`,
 				name: `${name} (${suffix})`,
diff --git a/src/lib/components/workspace/Skills/SkillFiles.svelte b/src/lib/components/workspace/Skills/SkillFiles.svelte
index 950c334359..9553c3d379 100644
--- a/src/lib/components/workspace/Skills/SkillFiles.svelte
+++ b/src/lib/components/workspace/Skills/SkillFiles.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { v4 as uuidv4 } from 'uuid';
 	import { onDestroy, getContext, tick, type Snippet } from 'svelte';
 	import { toast } from 'svelte-sonner';
 	import { createFocusTrap } from 'focus-trap';
@@ -78,7 +79,7 @@
 	let newName = '';
 	let newNameInput: HTMLInputElement;
 	let dialog = { show: false, title: '', input: false, value: '', action: (_: string) => {} };
-	const dragType = `application/x-skill-file-${crypto.randomUUID()}`;
+	const dragType = `application/x-skill-file-${uuidv4()}`;
 
 	const ask = (title: string, input: boolean, action: (value: string) => void, value = '') => {
 		dialog = { show: true, title, input, value, action };
diff --git a/src/lib/utils/realtime.ts b/src/lib/utils/realtime.ts
index 1b07aa0877..d1d76f5666 100644
--- a/src/lib/utils/realtime.ts
+++ b/src/lib/utils/realtime.ts
@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from 'uuid';
 import { AUDIO_API_BASE_URL } from '$lib/constants';
 
 export type BridgeSubmission = {
@@ -122,7 +123,7 @@ export class RealtimeCall {
 		this.connecting = true;
 		this.options.change();
 		const session = ++this.session;
-		this.callId = crypto.randomUUID();
+		this.callId = uuidv4();
 		try {
 			const context = this.options.context();
 			this.token = token;