diff --git a/.travis.yml b/.travis.yml
index 7c047628d..2970497ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
   - sudo apt-get install chromium-chromedriver
   - gem update --system
   - gem --version
-  - gem install bundler
+  - gem install bundler -v 1.17.3
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8a743b546..d00ebc541 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -25,11 +25,11 @@ def edit
   end
 
   def index
-    season = Season.find_by(name: params['filter']) || Season.current
-    @projects = if season.current? and !season.active?
-                  Project.in_current_season.not_rejected
+    season = Season.find_by(name: params['filter'])
+    @projects = if season&.started? || !Season.current.transition?
+                  Project.selected(season: season || Season.current)
                 else
-                  Project.selected(season: season)
+                  Project.in_current_season.not_rejected
                 end
   end