diff --git a/mq/main/mq-client/src/main/java/com/sun/messaging/ConnectionFactory_defaults.properties b/mq/main/mq-client/src/main/java/com/sun/messaging/ConnectionFactory_defaults.properties
index 716003436..7ba51acaa 100644
--- a/mq/main/mq-client/src/main/java/com/sun/messaging/ConnectionFactory_defaults.properties
+++ b/mq/main/mq-client/src/main/java/com/sun/messaging/ConnectionFactory_defaults.properties
@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2024 Contributors to the Eclipse Foundation
 # Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -27,7 +28,7 @@ imqAbortOnPingAckTimeout=false
 imqConnectionType=TCP
 imqConnectionHandler=com.sun.messaging.jmq.jmsclient.protocol.tcp.TCPStreamHandler
 imqSocketConnectTimeout=0
-imqPortMapperSoTimeout=-1
+imqPortMapperSoTimeout=60000
 #The following properties do not belong here since they are really controlled by imqConnectionHandler
 #Remember to remove the block after admin is able to handle this properly
 imqBrokerHostName=localhost