diff --git a/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java
index 5ea3fb085cbc64d2ff58b0c4cf2e349d79bcbce9..00bae7b75e685851dfd1fbffc4e7e6a45b816cd6 100644
--- a/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java
+++ b/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java
@@ -57,7 +57,7 @@ public class TLSSocketFactory extends SSLSocketFactory {
     }
 
     private static Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
+        if(socket instanceof SSLSocket) {
             SSLSocketHelper.setSecurity((SSLSocket) socket);
         }
         return socket;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f7815712d150f70165f64cddac4a5387ec801ee9..299a37aa4545e76acb2a7919e7e0465a50cbb82b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -843,11 +843,14 @@ public class XmppConnection implements Runnable {
 
             final SSLSocket sslSocket = (SSLSocket) tlsFactoryVerifier.factory.createSocket(socket, address.getHostAddress(), socket.getPort(), true);
 
+
             if (sslSocket == null) {
                 throw new IOException("could not initialize ssl socket");
             }
 
             SSLSocketHelper.setSecurity(sslSocket);
+            SSLSocketHelper.setHostname(sslSocket, account.getServer());
+            SSLSocketHelper.setApplicationProtocol(sslSocket, "xmpp-client");
 
             if (!tlsFactoryVerifier.verifier.verify(account.getServer(), this.verifiedHostname, sslSocket.getSession())) {
                 Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": TLS certificate verification failed");