diff --git a/app/models/broadcast_message.py b/app/models/broadcast_message.py
index cbf35d832..b1c0a8ad5 100644
--- a/app/models/broadcast_message.py
+++ b/app/models/broadcast_message.py
@@ -252,7 +252,7 @@ class BroadcastMessage(JSONModel):
         self._update(
             starts_at=datetime.utcnow().isoformat(),
             finishes_at=(
-                datetime.utcnow() + timedelta(hours=4, minutes=0)
+                datetime.utcnow() + timedelta(hours=23, minutes=59)
             ).isoformat(),
         )
         self._set_status_to('broadcasting')
diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py
index db095f246..6e480f0c9 100644
--- a/tests/app/main/views/test_broadcast.py
+++ b/tests/app/main/views/test_broadcast.py
@@ -2457,7 +2457,7 @@ def test_confirm_approve_broadcast(
             broadcast_message_id=fake_uuid,
             data={
                 'starts_at': '2020-02-22T22:22:22',
-                'finishes_at': '2020-02-23T02:22:22',
+                'finishes_at': '2020-02-23T22:21:22',
             },
         )
         mock_update_broadcast_message_status.assert_called_once_with(