diff --git a/Changelog b/Changelog
index d60c2d5cb..dce9897cc 100644
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,7 @@
     - BUGFIX: Threads are now stopped cleanly before their destruction
     - BUGFIX: Create Options object only when necessary (to save memory)
     - BUGFIX: Let libtorrent store the torrent handles (save memory)
+    - BUGFIX: Set DHT Port only when DHT is enabled
     - I18N: Better internationalization thanks to dynamic text support
     - COSMETIC: Replaced OSD messages by Qt4.2 systray messages
 
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 66b45cb0f..c42879ba6 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -1191,11 +1191,11 @@ void GUI::configureSession(bool deleteOptions){
   // DHT (Trackerless)
   if(options->isDHTEnabled()){
     BTSession.enableDHT();
+    // Set DHT Port
+    BTSession.setDHTPort(options->getDHTPort());
   }else{
     BTSession.disableDHT();
   }
-  // Set DHT Port
-  BTSession.setDHTPort(options->getDHTPort());
   if(!options->isPeXDisabled()){
     qDebug("Enabling Peer eXchange (PeX)");
     BTSession.enablePeerExchange();