diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift
index 67e34376b..ce2b74f99 100644
--- a/Session/Home/New Conversation/NewMessageScreen.swift	
+++ b/Session/Home/New Conversation/NewMessageScreen.swift	
@@ -99,6 +99,8 @@ struct NewMessageScreen: View {
                                             case SnodeAPIError.onsDecryptionFailed, SnodeAPIError.onsHashingFailed,
                                                 SnodeAPIError.onsValidationFailed:
                                                 return "onsErrorUnableToSearch".localized()
+                                            case SnodeAPIError.onsNotFound:
+                                                return "new_message_screen_error_msg_unrecognized_ons".localized()
                                             case is NetworkError:
                                                 return "onsErrorUnableToSearch".localized()
                                             default: break
diff --git a/SessionSnodeKit/Models/ONSResolveResponse.swift b/SessionSnodeKit/Models/ONSResolveResponse.swift
index c78d765d6..3899166b1 100644
--- a/SessionSnodeKit/Models/ONSResolveResponse.swift
+++ b/SessionSnodeKit/Models/ONSResolveResponse.swift
@@ -13,7 +13,7 @@ extension SnodeAPI {
             }
             
             fileprivate let nonce: String?
-            fileprivate let encryptedValue: String
+            fileprivate let encryptedValue: String?
         }
         
         enum CodingKeys: String, CodingKey {
@@ -35,7 +35,9 @@ extension SnodeAPI {
         // MARK: - Convenience
         
         func sessionId(sodium: Sodium, nameBytes: [UInt8], nameHashBytes: [UInt8]) throws -> String {
-            let ciphertext: [UInt8] = Data(hex: result.encryptedValue).bytes
+            guard let encryptedValue = result.encryptedValue else { throw SnodeAPIError.onsNotFound }
+            
+            let ciphertext: [UInt8] = Data(hex: encryptedValue).bytes
             
             // Handle old Argon2-based encryption used before HF16
             guard let hexEncodedNonce: String = result.nonce else {
diff --git a/SessionSnodeKit/Networking/SnodeAPI.swift b/SessionSnodeKit/Networking/SnodeAPI.swift
index 008591948..2ecd34607 100644
--- a/SessionSnodeKit/Networking/SnodeAPI.swift
+++ b/SessionSnodeKit/Networking/SnodeAPI.swift
@@ -414,7 +414,6 @@ public final class SnodeAPI {
                                 )
                             }
                             .send(using: dependencies)
-                            .retry(4)
                             .map { _, sessionId in sessionId }
                             .eraseToAnyPublisher()
                     }
diff --git a/SessionSnodeKit/Types/SnodeAPIError.swift b/SessionSnodeKit/Types/SnodeAPIError.swift
index 3a5919807..b101cf2c6 100644
--- a/SessionSnodeKit/Types/SnodeAPIError.swift
+++ b/SessionSnodeKit/Types/SnodeAPIError.swift
@@ -27,6 +27,7 @@ public enum SnodeAPIError: Error, CustomStringConvertible {
     case onsDecryptionFailed
     case onsHashingFailed
     case onsValidationFailed
+    case onsNotFound
     
     // Quic
     case invalidNetwork
@@ -65,6 +66,7 @@ public enum SnodeAPIError: Error, CustomStringConvertible {
             case .onsDecryptionFailed: return "Couldn't decrypt ONS name (SnodeAPIError.onsDecryptionFailed)."
             case .onsHashingFailed: return "Couldn't compute ONS name hash (SnodeAPIError.onsHashingFailed)."
             case .onsValidationFailed: return "ONS name validation failed (SnodeAPIError.onsValidationFailed)."
+            case .onsNotFound: return "ONS name not found (SnodeAPIError.onsNotFound)"
                 
             // Quic
             case .invalidNetwork: return "Unable to create network (SnodeAPIError.invalidNetwork)."