diff --git a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
index 18d97f6c..70f36c3d 100644
--- a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
@@ -19,7 +19,8 @@ extension MessageEntity {
 	}
 
 	var canRetry: Bool {
-		return ackError == 9 || ackError == 5 || ackError == 3
+		let re = RoutingError(rawValue: Int(ackError))
+		return re?.canRetry ?? false
 	}
 
 	var tapbacks: [MessageEntity] {