diff --git a/api/lib/data-mission.ts b/api/lib/data-mission.ts
index ed2f76070..dd639c5fe 100644
--- a/api/lib/data-mission.ts
+++ b/api/lib/data-mission.ts
@@ -24,7 +24,9 @@ export default class DataMission {
             if (!data.mission_sync) return;
 
             if (!data.mission_groups.length) {
-                data.mission_groups = (await api.Group.list({})).data.map((group) =>{
+                data.mission_groups = (await api.Group.list({
+                    useCache: 'true'
+                })).data.map((group) =>{
                     return group.name;
                 });
             }
diff --git a/api/web/src/components/util/GroupSelectModal.vue b/api/web/src/components/util/GroupSelectModal.vue
index 067aba293..4725c3ac7 100644
--- a/api/web/src/components/util/GroupSelectModal.vue
+++ b/api/web/src/components/util/GroupSelectModal.vue
@@ -72,10 +72,16 @@ export default {
         },
         fetch: async function() {
             this.loading.groups = true;
-            const url = window.stdurl('/api/marti/group');
-            if (this.connection) url.searchParams.append('connection', this.connection);
-            this.list = await window.std(url);
-            this.loading.groups = false;
+
+            if (this.connection) {
+                const url = window.stdurl(`/api/connection/${this.connection}/channel`);
+                this.list = await window.std(url);
+                this.loading.groups = false;
+            } else {
+                const url = window.stdurl('/api/marti/group');
+                this.list = await window.std(url);
+                this.loading.groups = false;
+            }
         },
         close: function() {
             this.$emit('close');