diff --git a/website/client/components/selectMembersModal.vue b/website/client/components/selectMembersModal.vue
index bd69b442c9..49315788b5 100644
--- a/website/client/components/selectMembersModal.vue
+++ b/website/client/components/selectMembersModal.vue
@@ -181,11 +181,13 @@ export default {
         this.members = members;
       }
 
-      if (this.$store.state.memberModalOptions.viewingMembers.length > 0) {
-        this.members = this.$store.state.viewingMembers;
+      if ((!this.members || this.members.length === 0) &&
+          this.$store.state.memberModalOptions.viewingMembers.length > 0
+      ) {
+        this.members = this.$store.state.memberModalOptions.viewingMembers;
       }
 
-      if (this.members.length === 0 && !this.groupId) {
+      if (!this.members || this.members.length === 0 && !this.groupId) {
         this.members = [this.user];
       }
     },