diff --git a/zerver/lib/notifications.py b/zerver/lib/notifications.py
index 5d7a09ce52..95d5fe1e46 100644
--- a/zerver/lib/notifications.py
+++ b/zerver/lib/notifications.py
@@ -202,7 +202,9 @@ def do_send_missedmessage_events_reply_in_zulip(user_profile, missed_messages, m
     `missed_messages` is a list of Message objects to remind about they should
                       all have the same recipient and subject
     """
-    if not user_profile.enable_offline_email_notifications:
+    # Disabled missedmessage emails internally
+    if (not user_profile.enable_offline_email_notifications
+        or user_profile.realm.domain == "zulip.com"):
         return
 
     recipients = set((msg.recipient_id, msg.subject) for msg in missed_messages)
@@ -254,7 +256,9 @@ def do_send_missedmessage_events(user_profile, missed_messages, message_count):
     `user_profile` is the user to send the reminder to
     `missed_messages` is a list of Message objects to remind about
     """
-    if not user_profile.enable_offline_email_notifications:
+    # Disabled missedmessage emails internally
+    if (not user_profile.enable_offline_email_notifications
+        or user_profile.realm.domain == "zulip.com"):
         return
 
     senders = set(m.sender.full_name for m in missed_messages)
diff --git a/zerver/management/commands/enqueue_digest_emails.py b/zerver/management/commands/enqueue_digest_emails.py
index 4905c2fe36..82647a0a8d 100644
--- a/zerver/management/commands/enqueue_digest_emails.py
+++ b/zerver/management/commands/enqueue_digest_emails.py
@@ -94,7 +94,8 @@ in a while.
             deactivated=False).values_list('domain', flat=True)
         # This list much match the list of domains for the
         # dont_show_digest_email_setting feature flag.
-        non_digest_domains = set(("mit.edu", "customer29.invalid", "customer20.invalid"))
+        non_digest_domains = set(("mit.edu", "customer29.invalid",
+                                  "customer20.invalid", "zulip.com"))
         digest_domains = set(all_domains) - non_digest_domains
 
         deployment_domains = domains_for_this_deployment()