diff --git a/analytics/lib/counts.py b/analytics/lib/counts.py
index 3b78b5a3c8..4278debd45 100644
--- a/analytics/lib/counts.py
+++ b/analytics/lib/counts.py
@@ -75,7 +75,7 @@ def process_count_stat(stat, fill_to_time):
         logger.info("INITIALIZED %s %s" % (stat.property, currently_filled))
     elif fill_state.state == FillState.STARTED:
         logger.info("UNDO START %s %s" % (stat.property, fill_state.end_time))
-        do_delete_count_stat_at_hour(stat, fill_state.end_time)
+        do_delete_counts_at_hour(stat, fill_state.end_time)
         currently_filled = fill_state.end_time - timedelta(hours = 1)
         do_update_fill_state(fill_state, currently_filled, FillState.DONE)
         logger.info("UNDO DONE %s" % (stat.property,))
@@ -112,13 +112,21 @@ def do_fill_count_stat_at_hour(stat, end_time):
     do_pull_from_zerver(stat, start_time, end_time)
     do_aggregate_to_summary_table(stat, end_time)
 
-def do_delete_count_stat_at_hour(stat, end_time):
+def do_delete_counts_at_hour(stat, end_time):
     # type: (CountStat, datetime) -> None
     UserCount.objects.filter(property = stat.property, end_time = end_time).delete()
     StreamCount.objects.filter(property = stat.property, end_time = end_time).delete()
     RealmCount.objects.filter(property = stat.property, end_time = end_time).delete()
     InstallationCount.objects.filter(property = stat.property, end_time = end_time).delete()
 
+def do_delete_count_stat(property):
+    # type: (str) -> None
+    UserCount.objects.filter(property=property).delete()
+    StreamCount.objects.filter(property=property).delete()
+    RealmCount.objects.filter(property=property).delete()
+    InstallationCount.objects.filter(property=property).delete()
+    FillState.objects.filter(property=property).delete()
+
 def do_drop_all_analytics_tables():
     # type: () -> None
     UserCount.objects.all().delete()
@@ -347,7 +355,7 @@ COUNT_STATS = {
     'messages_sent:client:day': CountStat(
         'messages_sent:client:day', zerver_count_message_by_user, {},
         (Message, 'sending_client_id'), CountStat.DAY, False),
-    'messages_sent_to_stream:is_bot:hour': CountStat(
-        'messages_sent_to_stream:is_bot', zerver_count_message_by_stream, {},
-        (UserProfile, 'is_bot'), CountStat.HOUR, False)
+    'messages_in_stream:is_bot:day': CountStat(
+        'messages_in_stream:is_bot:day', zerver_count_message_by_stream, {},
+        (UserProfile, 'is_bot'), CountStat.DAY, False)
 }
diff --git a/analytics/migrations/0009_remove_messages_to_stream_stat.py b/analytics/migrations/0009_remove_messages_to_stream_stat.py
new file mode 100644
index 0000000000..7d3da10e76
--- /dev/null
+++ b/analytics/migrations/0009_remove_messages_to_stream_stat.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.migrations.state import StateApps
+from django.db import migrations
+
+from analytics.lib.counts import do_delete_count_stat
+
+def delete_messages_sent_to_stream_stat(apps, schema_editor):
+    # type: (StateApps, DatabaseSchemaEditor) -> None
+    do_delete_count_stat('messages_sent_to_stream:is_bot')
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('analytics', '0008_add_count_indexes'),
+    ]
+
+    operations = [
+        migrations.RunPython(delete_messages_sent_to_stream_stat),
+    ]
diff --git a/analytics/tests/test_counts.py b/analytics/tests/test_counts.py
index dfffb018b2..a821005b44 100644
--- a/analytics/tests/test_counts.py
+++ b/analytics/tests/test_counts.py
@@ -392,7 +392,7 @@ class TestCountStats(AnalyticsTestCase):
 
     def test_messages_sent_to_stream_by_is_bot(self):
         # type: () -> None
-        stat = COUNT_STATS['messages_sent_to_stream:is_bot:hour']
+        stat = COUNT_STATS['messages_in_stream:is_bot:day']
         self.current_property = stat.property
 
         bot = self.create_user(is_bot=True)
@@ -420,9 +420,10 @@ class TestCountStats(AnalyticsTestCase):
 
         self.assertTableState(StreamCount, ['value', 'subgroup', 'stream'],
                               [[2, 'false', stream1], [1, 'false', stream2], [2, 'true', stream2],
-                               # "hourly" stream, from TestCountStats.setUp
-                               [1, 'false', Stream.objects.get(name='stream 1')]])
+                               # "hourly" and "daily" stream, from TestCountStats.setUp
+                               [1, 'false', Stream.objects.get(name='stream 1')],
+                               [1, 'false', Stream.objects.get(name='stream 61')]])
         self.assertTableState(RealmCount, ['value', 'subgroup', 'realm'],
-                              [[3, 'false'], [2, 'true'], [1, 'false', self.second_realm]])
-        self.assertTableState(InstallationCount, ['value', 'subgroup'], [[4, 'false'], [2, 'true']])
+                              [[3, 'false'], [2, 'true'], [2, 'false', self.second_realm]])
+        self.assertTableState(InstallationCount, ['value', 'subgroup'], [[5, 'false'], [2, 'true']])
         self.assertTableState(UserCount, [], [])