1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index 8b14367..807470e 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -72,20 +72,20 @@ void BasicSessionStream::addTLSEncryption() {
 		tlsLayer->onConnected.connect(boost::bind(&BasicSessionStream::handleTLSConnected, shared_from_this()));
 		tlsLayer->connect();
 	}
 }
 
 void BasicSessionStream::setWhitespacePingEnabled(bool enabled) {
-	if (enabled && !whitespacePingLayer) {
-		whitespacePingLayer = boost::shared_ptr<WhitespacePingLayer>(new WhitespacePingLayer());
-		streamStack->addLayer(whitespacePingLayer);
-	}
 	if (enabled) {
+		if (!whitespacePingLayer) {
+			whitespacePingLayer = boost::shared_ptr<WhitespacePingLayer>(new WhitespacePingLayer());
+			streamStack->addLayer(whitespacePingLayer);
+		}
 		whitespacePingLayer->setActive();
 	}
-	else {
+	else if (whitespacePingLayer) {
 		whitespacePingLayer->setInactive();
 	}
 }
 
 void BasicSessionStream::resetXMPPParser() {
   xmppLayer->resetParser();