diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index cf850b9b2..d1c7081d0 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -581,7 +581,8 @@ public class XmppConnectionService extends Service {
 					refreshAllGcmTokens();
 					break;
 				case ACTION_IDLE_PING:
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+							&& !Config.CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND) {
 						scheduleNextIdlePing();
 					}
 					break;
@@ -799,7 +800,8 @@ public class XmppConnectionService extends Service {
 		toggleForegroundService();
 		updateUnreadCountBadge();
 		toggleScreenEventReceiver();
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+				&& !Config.CLOSE_TCP_WHEN_SWITCHING_TO_BACKGROUND) {
 			scheduleNextIdlePing();
 		}
 	}