diff --git a/src/main/java/org/olat/instantMessaging/IMConfig.java b/src/main/java/org/olat/instantMessaging/IMConfig.java
index 69c50472de0cf21f2d6330cca51d2bd360ca3c43..dc966e59f0ece4b730b4131c1ed9bcc615a2152e 100644
--- a/src/main/java/org/olat/instantMessaging/IMConfig.java
+++ b/src/main/java/org/olat/instantMessaging/IMConfig.java
@@ -24,6 +24,7 @@
 */
 package org.olat.instantMessaging;
 
+import org.jivesoftware.smack.SmackConfiguration;
 import org.olat.core.logging.StartupException;
 
 /**
@@ -171,6 +172,10 @@ public class IMConfig {
 		this.syncLearningGroups = syncLearningGroups;
 	}
 	
+	public void setPacketReplyTimeout (int timeout) {
+		SmackConfiguration.setPacketReplyTimeout(timeout);
+	}
+
 	// fxdiff: FXOLAT-46
 	/**
 	 * @param hideExternalClientInfo The hideExternalClientInfo to set.
diff --git a/src/main/java/org/olat/instantMessaging/_spring/instantMessagingContext.xml b/src/main/java/org/olat/instantMessaging/_spring/instantMessagingContext.xml
index 521e7c202dbf0430053ea75f4673b683b2c22aa9..eef0dcd25356c52bc972d0592693d7940e4cb52f 100644
--- a/src/main/java/org/olat/instantMessaging/_spring/instantMessagingContext.xml
+++ b/src/main/java/org/olat/instantMessaging/_spring/instantMessagingContext.xml
@@ -107,7 +107,7 @@
 		<property name="syncPersonalGroups" value="${instantMessaging.sync.personal.groups}" />
 		<!-- synchonisation of olat learning group as buddy group on IM server. Runs only once -->
 		<property name="syncLearningGroups" value="${instantMessaging.sync.learning.groups}" />
-		
+		<property name="packetReplyTimeout" value="${instantMessaging.packetReplyTimeout}" />
 	</bean>
 	
 	<bean id="org.olat.im.NameHelper" class="org.olat.instantMessaging.IMNameHelper">
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index c460bf10ff25e143f29d0dcedd93765c269e49fc..51285051f73f4258f899a16c393c7a188a6e3651 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -431,6 +431,8 @@ instantMessaging.sync.personal.groups=true
 instantMessaging.sync.learning.groups=true
 #FXOLAT-219 The delay
 instantMessaging.sync.learning.groups.start.delay=15000
+#Default in Smack is 5000 so set to that here
+instantMessaging.packetReplyTimeout=5000
 
 #whether to display current course participant count in the course toolbox
 course.display.participants.count=true