diff --git a/ChangeLog b/ChangeLog
index b310f2683..6f9138f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@ v1.14.2-snapshot
 ===========
 Bug fixes:
 - #7070 Fix radio button shifted focus on macOS
-- #7038 | #7104 | #7111 | #7112 Fix client and server different keyboard layout errors
+- #7038 | #7104 | #7111 | #7112 | #7113 Fix client and server different keyboard layout errors
 - #7078 Fix clipboard re-enables automatically
 - #7077 Fix Ubuntu, CentOS and Debian build after SYNERGY-1161
 - #7080 Add trace if the system can't open file with trusted fingerprints
diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp
index c8eb13534..a2e2aeac5 100644
--- a/src/lib/client/ServerProxy.cpp
+++ b/src/lib/client/ServerProxy.cpp
@@ -163,6 +163,7 @@ ServerProxy::parseHandshakeMessage(const UInt8* code)
 
         // handshake is complete
         m_parser = &ServerProxy::parseMessage;
+        checkMissedLanguages();
         m_client->handshakeComplete();
     }
 
@@ -961,13 +962,6 @@ ServerProxy::setServerLanguages()
     String serverLanguages;
     ProtocolUtil::readf(m_stream, kMsgDLanguageSynchronisation + 4, &serverLanguages);
     m_languageManager.setRemoteLanguages(serverLanguages);
-
-    auto missedLanguages = m_languageManager.getMissedLanguages();
-    if (!missedLanguages.empty()) {
-        AppUtil::instance().showNotification("Language synchronization error",
-              "You need to install these languages on this computer to enable support for multiple languages: "
-              + missedLanguages);
-    }
 }
 
 void
@@ -993,3 +987,14 @@ ServerProxy::setActiveServerLanguage(const String& language)
         LOG((CLOG_DEBUG1 "Active server langauge is empty!"));
     }
 }
+
+void
+ServerProxy::checkMissedLanguages() const
+{
+    auto missedLanguages = m_languageManager.getMissedLanguages();
+    if (!missedLanguages.empty()) {
+        AppUtil::instance().showNotification("Language synchronization error",
+              "You need to install these languages on this computer to enable support for multiple languages: "
+              + missedLanguages);
+    }
+}
diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h
index bd33492f2..876492937 100644
--- a/src/lib/client/ServerProxy.h
+++ b/src/lib/client/ServerProxy.h
@@ -116,6 +116,7 @@ private:
     void                secureInputNotification();
     void                setServerLanguages();
     void                setActiveServerLanguage(const String& language);
+    void                checkMissedLanguages() const;
 
 private:
     typedef EResult (ServerProxy::*MessageParser)(const UInt8*);