diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 79d52f2ac..29a876e87 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -13,8 +13,8 @@ def edit; end
 
   def step2
     @type = cookies[:member_type]
-    @coach_groups = Group.coaches
-    @student_groups = Group.students
+    @coach_groups = Group.where(chapter: { active: true }).coaches
+    @student_groups = Group.where(chapter: { active: true }).students
   end
 
   def profile
diff --git a/spec/features/member_joining_spec.rb b/spec/features/member_joining_spec.rb
index 2ded47291..1eeccd5c2 100644
--- a/spec/features/member_joining_spec.rb
+++ b/spec/features/member_joining_spec.rb
@@ -64,6 +64,23 @@
     expect(page).to have_css('.badge', text: 'Peanut allergy')
   end
 
+  scenario 'groups belonging to inactive chapters are not shown' do
+    member = Fabricate(:member)
+    group = Fabricate(:group)
+    coach_group = Fabricate(:coaches)
+    inactive_chapter = Fabricate(:chapter, active: false)
+    Fabricate(:group, chapter: inactive_chapter)
+    Fabricate(:coaches, chapter: inactive_chapter)
+
+    login member
+
+    visit step2_member_path
+
+    expect(page).to have_text(group.chapter.name)
+    expect(page).to have_text(coach_group.chapter.name)
+    expect(page).to have_no_text(inactive_chapter.name)
+  end
+
   scenario 'Picking a mailing list on step 2 subscribes you to that list' do
     member = Fabricate(:member)
     group = Fabricate(:group)