diff --git a/lib/src/regist.c b/lib/src/regist.c
index f686fe81..1b2bf3e0 100644
--- a/lib/src/regist.c
+++ b/lib/src/regist.c
@@ -649,10 +649,9 @@ static ChiakiErrorCode regist_recv_response(ChiakiRegist *regist, ChiakiRegister
 		RudpMessage message;
 		err = chiaki_rudp_send_recv(regist->info.rudp, &message, NULL, 0, remote_counter, ACK, FINISH, 0, 3);
 		if(err != CHIAKI_ERR_SUCCESS)
-		{
 			CHIAKI_LOGW(regist->log, "REGIST - Failed to finish rudp, continuing...");
-		}
-		chiaki_rudp_message_pointers_free(&message);
+		else
+			chiaki_rudp_message_pointers_free(&message);
 	}
 
 	CHIAKI_LOGV(regist->log, "Regist response HTTP header:");
diff --git a/lib/src/remote/holepunch.c b/lib/src/remote/holepunch.c
index 90c50728..b7e2ab6b 100644
--- a/lib/src/remote/holepunch.c
+++ b/lib/src/remote/holepunch.c
@@ -77,6 +77,7 @@
 #define MSG_TYPE_REQ 0x06000000
 #define MSG_TYPE_RESP 0x07000000
 #define EXTRA_CANDIDATE_ADDRESSES 3
+#define ENABLE_IPV6 false
 
 static const char oauth_header_fmt[] = "Authorization: Bearer %s";
 
@@ -2588,7 +2589,7 @@ static ChiakiErrorCode send_offer(Session *session, int req_id, Candidate *local
             goto cleanup;
         }
         // Only PS5 supports ipv6
-        if(session->console_type == CHIAKI_HOLEPUNCH_CONSOLE_TYPE_PS5)
+        if(session->console_type == CHIAKI_HOLEPUNCH_CONSOLE_TYPE_PS5 && ENABLE_IPV6)
         {
             Candidate *candidate_stun_ipv6 = &msg.conn_request->candidates[msg.conn_request->num_candidates];
             candidate_stun_ipv6->type = CANDIDATE_TYPE_STUN;
diff --git a/lib/src/session.c b/lib/src/session.c
index 52e2e4f8..af9147cc 100644
--- a/lib/src/session.c
+++ b/lib/src/session.c
@@ -962,10 +962,9 @@ static ChiakiErrorCode session_thread_request_session(ChiakiSession *session, Ch
 		RudpMessage message;
 		err = chiaki_rudp_send_recv(session->rudp, &message, NULL, 0, remote_counter, ACK, FINISH, 0, 3);
 		if(err != CHIAKI_ERR_SUCCESS)
-		{
 			CHIAKI_LOGW(session->log, "SESSION START THREAD - Failed to finish rudp, continuing...");
-		}
-		chiaki_rudp_message_pointers_free(&message);
+		else
+			chiaki_rudp_message_pointers_free(&message);
 	}
 
 	ChiakiHttpResponse http_response;