diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 732dcf3587..62a9ad0c8f 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -4063,11 +4063,18 @@ def do_update_user_presence(user_profile: UserProfile,
                             log_time: datetime.datetime,
                             status: int) -> None:
     client = consolidate_client(client)
+
+    defaults = dict(
+        timestamp=log_time,
+        status=status,
+        realm_id=user_profile.realm_id
+    )
+
     (presence, created) = UserPresence.objects.get_or_create(
         user_profile = user_profile,
         client = client,
-        defaults = {'timestamp': log_time,
-                    'status': status})
+        defaults = defaults
+    )
 
     stale_status = (log_time - presence.timestamp) > datetime.timedelta(minutes=1, seconds=10)
     was_idle = presence.status == UserPresence.IDLE
diff --git a/zerver/migrations/0266_userpresence_realm.py b/zerver/migrations/0266_userpresence_realm.py
new file mode 100644
index 0000000000..3787c9171b
--- /dev/null
+++ b/zerver/migrations/0266_userpresence_realm.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.28 on 2020-02-08 20:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('zerver', '0265_remove_stream_is_announcement_only'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpresence',
+            name='realm',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='zerver.Realm'),
+        ),
+    ]
diff --git a/zerver/migrations/0267_backfill_userpresence_realm_id.py b/zerver/migrations/0267_backfill_userpresence_realm_id.py
new file mode 100644
index 0000000000..adcf830a6c
--- /dev/null
+++ b/zerver/migrations/0267_backfill_userpresence_realm_id.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('zerver', '0266_userpresence_realm'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            """
+            UPDATE zerver_userpresence
+            SET realm_id = zerver_userprofile.realm_id
+            FROM zerver_userprofile
+            WHERE zerver_userprofile.id = zerver_userpresence.user_profile_id;
+            """,
+            reverse_sql='UPDATE zerver_userpresence SET realm_id = NULL'),
+    ]
diff --git a/zerver/models.py b/zerver/models.py
index d5a7ec0e32..b07b7b4824 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -2329,6 +2329,7 @@ class UserPresence(models.Model):
         unique_together = ("user_profile", "client")
 
     user_profile = models.ForeignKey(UserProfile, on_delete=CASCADE)  # type: UserProfile
+    realm = models.ForeignKey(Realm, null=True)  # type: Optional[Realm]
     client = models.ForeignKey(Client, on_delete=CASCADE)  # type: Client
 
     # The time we heard this update from the client.
diff --git a/zerver/tests/test_message_edit_notifications.py b/zerver/tests/test_message_edit_notifications.py
index 780925f5e5..eeace418b9 100644
--- a/zerver/tests/test_message_edit_notifications.py
+++ b/zerver/tests/test_message_edit_notifications.py
@@ -271,6 +271,7 @@ class EditMessageSideEffectsTest(ZulipTestCase):
         cordelia = self.example_user('cordelia')
         UserPresence.objects.create(
             user_profile_id=cordelia.id,
+            realm_id=cordelia.realm_id,
             status=UserPresence.ACTIVE,
             client=get_client('web'),
             timestamp=timezone_now(),
diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py
index 89ce95bb0a..5fe9ab1d29 100644
--- a/zerver/tests/test_messages.py
+++ b/zerver/tests/test_messages.py
@@ -3842,10 +3842,11 @@ class MissedMessageTest(ZulipTestCase):
             )
             self.assertEqual(sorted(user_ids), sorted(presence_idle_user_ids))
 
-        def set_presence(user_id: int, client_name: str, ago: int) -> None:
+        def set_presence(user: UserProfile, client_name: str, ago: int) -> None:
             when = timezone_now() - datetime.timedelta(seconds=ago)
             UserPresence.objects.create(
-                user_profile_id=user_id,
+                user_profile_id=user.id,
+                realm_id=user.realm_id,
                 client=get_client(client_name),
                 timestamp=when,
             )
@@ -3857,10 +3858,10 @@ class MissedMessageTest(ZulipTestCase):
         user_flags[hamlet.id] = ['mentioned']
         assert_missing([hamlet.id])
 
-        set_presence(hamlet.id, 'iPhone', ago=5000)
+        set_presence(hamlet, 'iPhone', ago=5000)
         assert_missing([hamlet.id])
 
-        set_presence(hamlet.id, 'webapp', ago=15)
+        set_presence(hamlet, 'webapp', ago=15)
         assert_missing([])
 
         message_type = 'private'
diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py
index 0bb687fdcd..daf4739ab7 100644
--- a/zilencer/management/commands/populate_db.py
+++ b/zilencer/management/commands/populate_db.py
@@ -464,6 +464,7 @@ class Command(BaseCommand):
                 if user.full_name[0] <= 'H':
                     client = get_client("ZulipAndroid")
                 UserPresence.objects.get_or_create(user_profile=user,
+                                                   realm_id=user.realm_id,
                                                    client=client,
                                                    timestamp=date,
                                                    status=status)