diff --git a/src/Robin/Ntlm/Message/NtlmV1AuthenticateMessageEncoder.php b/src/Robin/Ntlm/Message/NtlmV1AuthenticateMessageEncoder.php
index 6c5e3c9..726021d 100644
--- a/src/Robin/Ntlm/Message/NtlmV1AuthenticateMessageEncoder.php
+++ b/src/Robin/Ntlm/Message/NtlmV1AuthenticateMessageEncoder.php
@@ -159,7 +159,7 @@ public function encode(
     ) {
         $negotiate_flags = $server_challenge->getNegotiateFlags();
         $server_challenge_nonce = $server_challenge->getNonce();
-        $target_name = $server_challenge->getTargetName() ?: $nt_domain;
+        $target_name = $nt_domain ?: $server_challenge->getTargetName();
 
         $client_challenge = null;
 
diff --git a/src/Robin/Ntlm/Message/NtlmV2AuthenticateMessageEncoder.php b/src/Robin/Ntlm/Message/NtlmV2AuthenticateMessageEncoder.php
index d31249b..dae46a3 100644
--- a/src/Robin/Ntlm/Message/NtlmV2AuthenticateMessageEncoder.php
+++ b/src/Robin/Ntlm/Message/NtlmV2AuthenticateMessageEncoder.php
@@ -138,7 +138,7 @@ public function encode(
         $negotiate_flags = $server_challenge->getNegotiateFlags();
         $server_challenge_nonce = $server_challenge->getNonce();
         $target_info = $server_challenge->getTargetInfo();
-        $target_name = $server_challenge->getTargetName() ?: $nt_domain;
+        $target_name = $nt_domain ?: $server_challenge->getTargetName();
 
         // Generate a client challenge
         $client_challenge = $this->random_byte_generator->generate(static::CLIENT_CHALLENGE_LENGTH);