diff --git a/src/client.cpp b/src/client.cpp
index b1638ab272..6c7464b976 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -51,7 +51,6 @@
 /* Implementation *************************************************************/
 CClient::CClient ( const quint16  iPortNumber,
                    const quint16  iQosNumber,
-                   const QString& strConnOnStartupAddress,
                    const bool     bNoAutoJackConnect,
                    const QString& strNClientName,
                    const bool     bNDisableIPv6,
@@ -212,13 +211,6 @@ CClient::CClient ( const quint16  iPortNumber,
     // start the socket (it is important to start the socket after all
     // initializations and connections)
     Socket.Start();
-
-    // do an immediate start if a server address is given
-    if ( !strConnOnStartupAddress.isEmpty() )
-    {
-        SetServerAddr ( strConnOnStartupAddress );
-        Start();
-    }
 }
 
 // MIDI setup will be handled after settings are assigned
diff --git a/src/client.h b/src/client.h
index 27c78cdf3d..06847dc6d4 100644
--- a/src/client.h
+++ b/src/client.h
@@ -150,7 +150,6 @@ class CClient : public QObject
 public:
     CClient ( const quint16  iPortNumber,
               const quint16  iQosNumber,
-              const QString& strConnOnStartupAddress,
               const bool     bNoAutoJackConnect,
               const QString& strNClientName,
               const bool     bNDisableIPv6,
diff --git a/src/main.cpp b/src/main.cpp
index f840503b88..a60fe97222 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -951,8 +951,7 @@ int main ( int argc, char** argv )
 #ifndef SERVER_ONLY
         if ( bIsClient )
         {
-            CClient
-                Client ( iPortNumber, iQosNumber, strConnOnStartupAddress, bNoAutoJackConnect, strClientName, bDisableIPv6, bMuteMeInPersonalMix );
+            CClient Client ( iPortNumber, iQosNumber, bNoAutoJackConnect, strClientName, bDisableIPv6, bMuteMeInPersonalMix );
 
             // Create Settings with the client pointer
             CClientSettings Settings ( &Client, strIniFileName );
@@ -988,6 +987,12 @@ int main ( int argc, char** argv )
             else
 #    endif
             {
+                if ( !strConnOnStartupAddress.isEmpty() )
+                {
+                    Client.SetServerAddr ( strConnOnStartupAddress );
+                    Client.Start();
+                }
+
                 // only start application without using the GUI
                 qInfo() << qUtf8Printable ( GetVersionAndNameStr ( false ) );