diff --git a/Muxy/Services/PaneOwnershipStore.swift b/Muxy/Services/PaneOwnershipStore.swift
index 03f576bb..9e434ea3 100644
--- a/Muxy/Services/PaneOwnershipStore.swift
+++ b/Muxy/Services/PaneOwnershipStore.swift
@@ -1,5 +1,6 @@
 import Foundation
 import MuxyShared
+import SystemConfiguration
 
 @MainActor
 @Observable
@@ -7,9 +8,10 @@ final class PaneOwnershipStore {
     static let shared = PaneOwnershipStore()
 
     var macDeviceName: String = {
-        let raw = ProcessInfo.processInfo.hostName
-        let trimmed = raw.split(separator: ".").first.map(String.init) ?? raw
-        return trimmed.isEmpty ? "Mac" : trimmed
+        if let name = SCDynamicStoreCopyComputerName(nil, nil) as String?, !name.isEmpty {
+            return name
+        }
+        return "Mac"
     }()
 
     private var owners: [UUID: PaneOwnerDTO] = [:]