diff --git a/Changes b/Changes
index bda873c..e6d5f50 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+  async: Set connection remote_host only when the reverse DNS lookup is
+  successful
+
   Create async version of dns_whitelist_soft, rhsbl and uribl plugins.
 
   async: added pre- and post-connection hooks
diff --git a/lib/Qpsmtpd/PollServer.pm b/lib/Qpsmtpd/PollServer.pm
index 566bf04..62a6de7 100644
--- a/lib/Qpsmtpd/PollServer.pm
+++ b/lib/Qpsmtpd/PollServer.pm
@@ -183,7 +183,7 @@ sub start_conversation {
     ParaDNS->new(
         finished   => sub { $self->continue_read(); $self->run_hooks("connect") },
         # NB: Setting remote_info to the same as remote_host
-        callback   => sub { $conn->remote_info($conn->remote_host($_[0])) },
+        callback   => sub { $conn->remote_info($conn->remote_host($_[0])) if $_[0] !~ /^[A-Z]+$/ },
         host       => $ip,
     );