diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index f21a73e23fe68f65dcc3aa89479b416a5123efca..8234423fa051b5e05b708e8f83a205225551534a 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -757,7 +757,12 @@ void JamiAccount::unserialize(const YAML::Node &node)
         JAMI_WARN("can't read receipt: %s", e.what());
     }
 
-    parseValueOptional(node, Conf::DHT_PORT_KEY, dhtPort_);
+    // HACK
+    // MacOS doesn't seems to close the DHT port sometimes, so re-using the DHT port seems
+    // to make the DHT unusable (Address already in use, and SO_REUSEADDR & SO_REUSEPORT
+    // doesn't seems to work). For now, use a random port
+    // See https://git.jami.net/savoirfairelinux/ring-client-macosx/issues/221
+    // TODO: parseValueOptional(node, Conf::DHT_PORT_KEY, dhtPort_);
     if (not dhtPort_)
         dhtPort_ = getRandomEvenPort(DHT_PORT_RANGE);
     dhtPortUsed_ = dhtPort_;