diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
index 51b5735f01045..a0a9cb5a61367 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { keys, pickBy } from 'lodash';
+import { keys, pickBy, isEmpty } from 'lodash';
 
 import { kea, MakeLogicType } from 'kea';
 
@@ -486,8 +486,10 @@ export const SourceLogic = kea<MakeLogicType<SourceValues, SourceActions>>({
       if (subdomain) params.append('subdomain', subdomain);
       if (indexPermissions) params.append('index_permissions', indexPermissions.toString());
 
+      const paramsString = !isEmpty(params) ? `?${params}` : '';
+
       try {
-        const response = await HttpLogic.values.http.get(`${route}?${params}`);
+        const response = await HttpLogic.values.http.get(`${route}${paramsString}`);
         actions.setSourceConnectData(response);
         successCallback(response.oauthUrl);
       } catch (e) {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.ts
index 1757f2a6414f7..4a7d44a936d9a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_logic.ts
@@ -14,7 +14,7 @@ import { HttpLogic } from '../../../shared/http';
 
 import {
   flashAPIErrors,
-  setSuccessMessage,
+  setQueuedSuccessMessage,
   FlashMessagesLogic,
 } from '../../../shared/flash_messages';
 
@@ -225,7 +225,7 @@ export const SourcesLogic = kea<MakeLogicType<ISourcesValues, ISourcesActions>>(
         }
       );
 
-      setSuccessMessage(
+      setQueuedSuccessMessage(
         [
           successfullyConnectedMessage,
           additionalConfiguration ? additionalConfigurationMessage : '',