diff --git a/app/models/organization.rb b/app/models/organization.rb
index e0a3eb1..1eb6d2f 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -135,7 +135,11 @@ class Organization < Profile
   end
 
   def notification_emails
-    [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
+    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    if emails.empty?
+      emails << environment.contact_email
+    end
+    emails
   end
 
   def already_request_membership?(person)
diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
index 7bb44bf..4ae18d1 100644
--- a/test/unit/organization_test.rb
+++ b/test/unit/organization_test.rb
@@ -123,9 +123,9 @@ class OrganizationTest < ActiveSupport::TestCase
     assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails
   end
 
-  should 'return empty array if contact_email is a blank string and it has no admin' do
+  should 'use the environment contact email if no emails are listed here' do
     o = build(Organization, :contact_email => '', :environment => Environment.default)
-    assert_equal [], o.notification_emails
+    assert_equal [o.environment.contact_email], o.notification_emails
   end
 
   should 'list pending enterprise validations' do
--
libgit2 0.21.2