diff --git a/assets/packages/limesurvey/survey.js b/assets/packages/limesurvey/survey.js
index d5dafe5ea57..0240012b45c 100644
--- a/assets/packages/limesurvey/survey.js
+++ b/assets/packages/limesurvey/survey.js
@@ -326,8 +326,3 @@ function alertSurveyDialog(text,title)
 {
     alert(text);
 }
-
-/* document ready function */
-$(document).on('ready pjax:scriptcomplete', function () {
-    activateLanguageChanger();
-});
diff --git a/themes/survey/vanilla/scripts/theme.js b/themes/survey/vanilla/scripts/theme.js
index b058e941ba6..f7c6e1fe270 100644
--- a/themes/survey/vanilla/scripts/theme.js
+++ b/themes/survey/vanilla/scripts/theme.js
@@ -184,6 +184,9 @@ var ThemeScripts = function(){
             $(function () {
                 $('[data-toggle="tooltip"]').tooltip()
             })
+
+            // Bind language changer onclick event.
+            activateLanguageChanger();
         });
 
         /**