diff --git a/server/src/services/data_sources.service.ts b/server/src/services/data_sources.service.ts
index 93e87228df..eafa9fe69a 100644
--- a/server/src/services/data_sources.service.ts
+++ b/server/src/services/data_sources.service.ts
@@ -363,7 +363,8 @@ export class DataSourcesService {
     if (findOption(options, 'oauth2') && findOption(options, 'code')) {
       const provider = findOption(options, 'provider')['value'];
       const authCode = findOption(options, 'code')['value'];
-      const plugin_id = findOption(options, 'plugin_id')['value'];
+      const pluginIdOption = findOption(options, 'plugin_id');
+      const plugin_id = pluginIdOption ? pluginIdOption['value'] : null;
       const queryService = await this.pluginsHelper.getService(plugin_id, provider);
 
       //const queryService = new allPlugins[provider]();