diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 1b9cffe95..04186bd4f 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -363,7 +363,7 @@ void Bittorrent::configureSession() {
     if(enableDHT(true)) {
       int dht_port;
       if(Preferences::isDHTPortSameAsBT())
-        dht_port = new_listenPort;
+        dht_port = 0;
       else
         dht_port = Preferences::getDHTPort();
       setDHTPort(dht_port);
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index c093d4673..ff3355aa4 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -890,8 +890,6 @@ bool options_imp::systrayIntegration() const{
 }
 
 int options_imp::getDHTPort() const {
-  if(isDHTPortSameAsBT())
-    return 0;
   return spinDHTPort->value();
 }