diff --git a/app/models/user.rb b/app/models/user.rb
index d68108a8e8e..7298f88e54c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -635,7 +635,7 @@ class User < ActiveRecord::Base
   # possibility of the commit_email column not existing.
 
   def commit_email
-    return unless has_attribute?(:commit_email)
+    return self.email unless has_attribute?(:commit_email)
 
     # The commit email is the same as the primary email if undefined
     super.presence || self.email