diff --git a/app/models/shipit/stack.rb b/app/models/shipit/stack.rb
index <HASH>..<HASH> 100644
--- a/app/models/shipit/stack.rb
+++ b/app/models/shipit/stack.rb
@@ -284,6 +284,8 @@ module Shipit
       handle_github_redirections do
         Shipit.github_api.commits(github_repo_name, sha: branch)
       end
+    rescue Octokit::Conflict
+      [] # Repository is empty...
     end
 
     def handle_github_redirections
Handle <I> conflict when listing repo commits