diff --git a/app/models/repository.rb b/app/models/repository.rb
index be30a3b0906..e050bd45254 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -239,6 +239,10 @@ class Repository
     end
 
     expire_branch_cache(branch_name)
+
+    # This ensures this particular cache is flushed after the first commit to a
+    # new repository.
+    expire_emptiness_caches if empty?
   end
 
   # Expires _all_ caches, including those that would normally only be expired
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 9242f755449..b596782f4e1 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -361,6 +361,20 @@ describe Repository, models: true do
 
       repository.expire_cache('master')
     end
+
+    it 'expires the emptiness cache for an empty repository' do
+      expect(repository).to receive(:empty?).and_return(true)
+      expect(repository).to receive(:expire_emptiness_caches)
+
+      repository.expire_cache
+    end
+
+    it 'does not expire the emptiness cache for a non-empty repository' do
+      expect(repository).to receive(:empty?).and_return(false)
+      expect(repository).to_not receive(:expire_emptiness_caches)
+
+      repository.expire_cache
+    end
   end
 
   describe '#expire_root_ref_cache' do