diff --git a/ChangeLog b/ChangeLog
index b3d3a5c4f..dce8195f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Deluge 1.1.0_RC4 (In Development)
+ Core:
+  * Fix issue in get_tracker_host when the torrent has no tracker
+
 Deluge 1.1.0_RC3 (05 January 2009)
  Core:
   * Fix applying proxy settings
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 8d2d219ec..7b7ceb872 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -522,7 +522,7 @@ class Torrent:
                 # Check if hostname is an IP address and just return it if that's the case
                 import socket
                 try:
-                    socket.inet_aton(url.hostname)
+                    socket.inet_aton(host)
                 except socket.error:
                     pass
                 else: