diff --git a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java
index 7526e124fa..d902d77229 100644
--- a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java
+++ b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java
@@ -73,7 +73,7 @@ protected void doStart() throws SensorHubException
 
         int count = 0;
         int retryAttempts = this.config.connection.reconnectAttempts;
-//        boolean isRetrying = retryAttempts >= 0;
+        
         while(true) {
             try {
                 InetAddress addr = InetAddress.getByName(config.remoteHost);
@@ -82,17 +82,15 @@ protected void doStart() throws SensorHubException
                     SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
                     socket = factory.createSocket(addr, config.remotePort);
                     ((SSLSocket) socket).startHandshake();
-                    is = socket.getInputStream();
-                    os = socket.getOutputStream();
                 } else {
                     SocketAddress endpoint = new InetSocketAddress(addr, config.remotePort);
                     socket = new Socket();
                     socket.connect(endpoint, this.config.connection.connectTimeout);
-                    is = socket.getInputStream();
-                    os = socket.getOutputStream();
-//                    isRetrying = false;
-                    break;
                 }
+
+                is = socket.getInputStream();
+                os = socket.getOutputStream();
+                break;
             } catch (IOException e) {
                 if(++count >= retryAttempts)
                     throw new SensorHubException("Cannot connect to remote host "