diff --git a/client/src/views/admin/index.js b/client/src/views/admin/index.js
index 2b73b154e1..e4512cf679 100644
--- a/client/src/views/admin/index.js
+++ b/client/src/views/admin/index.js
@@ -65,7 +65,11 @@ Espo.define('views/admin/index', 'view', function (Dep) {
                 'css=' + encodeURIComponent(this.getConfig().get('siteUrl') + '/' + this.getThemeManager().getStylesheet())
             ];
             this.iframeUrl = this.getConfig().get('adminPanelIframeUrl') || 'https://s.espocrm.com/';
-            this.iframeUrl += '?' + iframeParams.join('&');
+            if (~this.iframeUrl.indexOf('?')) {
+                this.iframeUrl += '&' + iframeParams.join('&');
+            } else {
+                this.iframeUrl += '?' + iframeParams.join('&');
+            }
 
             if (!this.getConfig().get('adminNotificationsDisabled')) {
                 this.createView('notificationsPanel', 'views/admin/panels/notifications', {