diff --git a/lib/include/chiaki/session.h b/lib/include/chiaki/session.h
index db7bf02..1706e27 100644
--- a/lib/include/chiaki/session.h
+++ b/lib/include/chiaki/session.h
@@ -155,7 +155,7 @@ typedef struct chiaki_session_t
 		bool ps5;
 		struct addrinfo *host_addrinfos;
 		struct addrinfo *host_addrinfo_selected;
-		char hostname[128];
+		char hostname[256];
 		char regist_key[CHIAKI_RPCRYPT_KEY_SIZE];
 		uint8_t morning[CHIAKI_RPCRYPT_KEY_SIZE];
 		uint8_t did[CHIAKI_RP_DID_SIZE];
diff --git a/lib/src/session.c b/lib/src/session.c
index de2f4e2..a57ea1d 100644
--- a/lib/src/session.c
+++ b/lib/src/session.c
@@ -596,11 +596,11 @@ static ChiakiErrorCode session_thread_request_session(ChiakiSession *session, Ch
 		set_port(sa, htons(SESSION_PORT));
 
 		// TODO: this can block, make cancelable somehow
-		int r = getnameinfo(sa, (socklen_t)ai->ai_addrlen, session->connect_info.hostname, sizeof(session->connect_info.hostname), NULL, 0, 0);
+		int r = getnameinfo(sa, (socklen_t)ai->ai_addrlen, session->connect_info.hostname, sizeof(session->connect_info.hostname), NULL, 0, NI_NUMERICHOST);
 		if(r != 0)
 		{
-			free(sa);
-			continue;
+			CHIAKI_LOGE(session->log, "getnameinfo failed with %s, filling the hostname with fallback", gai_strerror(r));
+			memcpy(session->connect_info.hostname, "unknown", 8);
 		}
 
 		CHIAKI_LOGI(session->log, "Trying to request session from %s:%d", session->connect_info.hostname, SESSION_PORT);