diff --git a/mp3/server.py b/mp3/server.py
index 623f8ab1bf06c1db0f3a964ad6abc8ac0b27aa63..446225b6baf21d463a122102e7ca19b43a327420 100644
--- a/mp3/server.py
+++ b/mp3/server.py
@@ -429,7 +429,8 @@ def parse_config(config_path: str) -> dict:
 
 def map_hostname_to_ip(servers):
     for server_id, server in servers.items():
-        SERVER_ID_TO_IP_MAPPING[server_id] = socket.gethostbyname(server[SERVER_ADDRESS])
+        SERVER_ID_TO_IP_MAPPING[server_id] = socket.gethostbyname(server[SERVER_ADDRESS]) \
+            if server[SERVER_ADDRESS] != 'localhost' else socket.gethostbyname(socket.gethostname())
         IP_TO_SERVER_ID_MAPPING[SERVER_ID_TO_IP_MAPPING[server_id]] = server_id