diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
index 935ad956..a1a0a03c 100644
--- a/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
+++ b/Meshtastic/Extensions/CoreData/NodeInfoEntityToNodeInfo.swift
@@ -15,7 +15,7 @@ extension NodeInfoEntity {
             userProto.shortName = user.shortName ?? ""
             userProto.hwModel = HardwareModel(rawValue: Int(user.hwModelId))!
             userProto.isLicensed = user.isLicensed
-			userProto.role = Config.DeviceConfig.Role(rawValue: Int(user.role))!
+			userProto.role = Config.DeviceConfig.Role(rawValue: Int(user.role)) ?? .unknown
 			userProto.publicKey = user.publicKey?.subdata(in: 0..<user.publicKey!.count) ?? Data()
         }
         var node = NodeInfo()