diff --git a/js/src/export.js b/js/src/export.js
index 94ab2a35e8..fc85300b1c 100644
--- a/js/src/export.js
+++ b/js/src/export.js
@@ -764,16 +764,22 @@ Export.checkTimeOut = function (timeLimit) {
     limit = limit + 1;
     clearTimeout(timeOut);
     timeOut = setTimeout(function () {
-        $.get('index.php?route=/export/check-time-out', { 'ajax_request': true }, function (data) {
-            if (data.message === 'timeout') {
-                ajaxShowMessage(
-                    '<div class="alert alert-danger" role="alert">' +
-                    window.Messages.strTimeOutError +
-                    '</div>',
-                    false
-                );
+        $.get('index.php?route=/export/check-time-out',
+            {
+                'ajax_request': true,
+                'server': CommonParams.get('server')
+            },
+            function (data) {
+                if (data.message === 'timeout') {
+                    ajaxShowMessage(
+                        '<div class="alert alert-danger" role="alert">' +
+                        window.Messages.strTimeOutError +
+                        '</div>',
+                        false
+                    );
+                }
             }
-        });
+        );
     }, limit * 1000);
 };
 
diff --git a/js/src/modules/themes-manager.js b/js/src/modules/themes-manager.js
index 43f2d119a0..48a75c0835 100644
--- a/js/src/modules/themes-manager.js
+++ b/js/src/modules/themes-manager.js
@@ -1,11 +1,12 @@
 import $ from 'jquery';
+import { CommonParams } from './common';
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
  */
 export const ThemesManager = {
     handleEvent: () => {
-        $.get('index.php?route=/themes', data => {
+        $.get('index.php?route=/themes', { 'server': CommonParams.get('server') }, data => {
             $('#themesModal .modal-body').html(data.themes);
         });
     }