diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 0467a5d14..d72bc1859 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -324,16 +324,10 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char* argv[] )
 
     KConfigGroup config(KSharedConfig::openConfig(), "General");
 
-    int realScreenCount = ScreenCount( QX11Info::display() );
-    bool screenCountChanged =
-         ( config.readEntry( "screenCount", realScreenCount ) != realScreenCount );
-
     QString loginMode = config.readEntry( "loginMode", "restorePreviousLogout" );
 
-    if ( parser.isSet( restoreOption ) && ! screenCountChanged )
+    if ( parser.isSet( restoreOption ))
         server->restoreSession( QStringLiteral( SESSION_BY_USER ) );
-    else if ( loginMode == QStringLiteral( "default" ) || screenCountChanged )
-        server->startDefaultSession();
     else if ( loginMode == QStringLiteral( "restorePreviousLogout" ) )
         server->restoreSession( QStringLiteral( SESSION_PREVIOUS_LOGOUT ) );
     else if ( loginMode == QStringLiteral( "restoreSavedSession" ) )
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index d6a5a478f..d95fd3d38 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -949,7 +949,6 @@ void KSMServer::storeSession()
     cg.writeEntry( "count", count );
 
     KConfigGroup cg2( config, "General");
-    cg2.writeEntry( "screenCount", ScreenCount(QX11Info::display()));
 
     storeLegacySession(config.data());
     config->sync();