diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6
index b93bb52d201..dce8f29371f 100644
--- a/app/assets/javascripts/discourse/routes/group-messages.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6
@@ -2,4 +2,14 @@ export default Discourse.Route.extend({
   titleToken() {
     return I18n.t('groups.messages');
   },
+
+  model() {
+    return this.modelFor('group');
+  },
+
+  afterModel(group) {
+    if (!group.get('is_group_user') || !(this.currentUser && this.currentUser.admin)) {
+      this.transitionTo("group.members", group);
+    }
+  },
 });