diff --git a/app/commands.py b/app/commands.py
index 2eacd7584..7563ae96f 100644
--- a/app/commands.py
+++ b/app/commands.py
@@ -618,30 +618,25 @@ def migrate_data_to_ft_notification_status(start_date, end_date):
         sql = \
             """
             insert into ft_notification_status (bst_date, template_id, service_id, job_id, notification_type, key_type,
-                notification_status, notification_count)
-                select bst_date, template_id, service_id, job_id, notification_type, key_type, notification_status,
-                    sum(notification_count) as notification_count
-                from (
-                    select
-                        da.bst_date,
-                        n.template_id,
-                        n.service_id,
-                        coalesce(n.job_id, '00000000-0000-0000-0000-000000000000') as job_id,
-                        n.notification_type,
-                        n.key_type,
-                        n.notification_status,
-                        1 as notification_count
-                    from public.notification_history n
-                    left join dm_datetime da on n.created_at >= da.utc_daytime_start
-                        and n.created_at < da.utc_daytime_end
-                    where n.created_at >= (date :start + time '00:00:00') at time zone 'Europe/London'
-                            at time zone 'UTC'
-                        and n.created_at < (date :end + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
-                        ) as individual_record
+                notification_status, created_at, notification_count)
+                select
+                    (n.created_at at time zone 'UTC' at time zone 'Europe/London')::timestamp::date as bst_date,
+                    n.template_id,
+                    n.service_id,
+                    coalesce(n.job_id, '00000000-0000-0000-0000-000000000000') as job_id,
+                    n.notification_type,
+                    n.key_type,
+                    n.notification_status,
+                    now() as created_at,
+                    count(*) as notification_count
+                from notification_history n
+                where n.created_at >= (date :start + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
+                    and n.created_at < (date :end + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
                 group by bst_date, template_id, service_id, job_id, notification_type, key_type, notification_status
                 order by bst_date
             on conflict on constraint ft_notification_status_pkey do update set
-                notification_count = excluded.notification_count
+                notification_count = excluded.notification_count,
+                updated_at = now()
             """
         result = db.session.execute(sql, {"start": process_date, "end": process_date + timedelta(days=1)})
         db.session.commit()
diff --git a/app/models.py b/app/models.py
index b697ab026..e7d0c8443 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1812,3 +1812,5 @@ class FactNotificationStatus(db.Model):
     key_type = db.Column(db.Text, primary_key=True, nullable=False)
     notification_status = db.Column(db.Text, primary_key=True, nullable=False)
     notification_count = db.Column(db.Integer(), nullable=False)
+    created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
diff --git a/migrations/versions/0195_ft_notification_timestamps.py b/migrations/versions/0195_ft_notification_timestamps.py
new file mode 100644
index 000000000..230075634
--- /dev/null
+++ b/migrations/versions/0195_ft_notification_timestamps.py
@@ -0,0 +1,23 @@
+"""
+
+Revision ID: 0195_ft_notification_timestamps
+Revises: 0194_ft_billing_created_at
+Create Date: 2018-05-22 16:01:53.269137
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = '0195_ft_notification_timestamps'
+down_revision = '0194_ft_billing_created_at'
+
+
+def upgrade():
+    op.add_column('ft_notification_status', sa.Column('created_at', sa.DateTime(), nullable=False))
+    op.add_column('ft_notification_status', sa.Column('updated_at', sa.DateTime(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('ft_notification_status', 'updated_at')
+    op.drop_column('ft_notification_status', 'created_at')