diff --git a/apps/desktop/src/main.tsx b/apps/desktop/src/main.tsx
index 902da12..deffdb6 100644
--- a/apps/desktop/src/main.tsx
+++ b/apps/desktop/src/main.tsx
@@ -847,12 +847,16 @@ const resolvedAppUrl = useMemo(() => {
 
   const ensureRustdesk = useCallback(async () => {
     if (!store) return null
+    if (!config?.machineId) {
+      logDesktop("rustdesk:skip:no-machine-id")
+      return null
+    }
     setIsRustdeskProvisioning(true)
     try {
       const payload = await invoke<RustdeskProvisioningResult>("ensure_rustdesk_and_emit", {
         configString: RUSTDESK_CONFIG_STRING || null,
         password: RUSTDESK_DEFAULT_PASSWORD || null,
-        machineId: config?.machineId ?? null,
+        machineId: config.machineId,
       })
       await handleRustdeskProvision(payload)
       return payload
@@ -896,13 +900,13 @@ const resolvedAppUrl = useMemo(() => {
     }
   }, [store, handleRustdeskProvision])
 
-useEffect(() => {
-  if (!store) return
-  if (!rustdeskInfo && !isRustdeskProvisioning && !rustdeskBootstrapRef.current) {
-    rustdeskBootstrapRef.current = true
-    ensureRustdesk().finally(() => {
-      rustdeskBootstrapRef.current = false
-    })
+  useEffect(() => {
+    if (!store || !config?.machineId) return
+    if (!rustdeskInfo && !isRustdeskProvisioning && !rustdeskBootstrapRef.current) {
+      rustdeskBootstrapRef.current = true
+      ensureRustdesk().finally(() => {
+        rustdeskBootstrapRef.current = false
+      })
     return
   }
   if (rustdeskInfo && !isRustdeskProvisioning) {