diff --git a/web/src/drafts.js b/web/src/drafts.js
index 6bcca2842a..76cefc3fcd 100644
--- a/web/src/drafts.js
+++ b/web/src/drafts.js
@@ -198,11 +198,9 @@ export function restore_message(draft) {
     let compose_args;
 
     if (draft.type === "stream") {
-        const stream_name = stream_data.get_stream_name_from_id(draft.stream_id);
         compose_args = {
             type: "stream",
             stream_id: draft.stream_id,
-            stream_name,
             topic: draft.topic,
             content: draft.content,
         };
diff --git a/web/src/drafts_overlay_ui.js b/web/src/drafts_overlay_ui.js
index e9aca58159..21f347dffa 100644
--- a/web/src/drafts_overlay_ui.js
+++ b/web/src/drafts_overlay_ui.js
@@ -29,7 +29,10 @@ function restore_draft(draft_id) {
         if (draft.stream_id !== undefined && draft.topic !== "") {
             narrow.activate(
                 [
-                    {operator: "stream", operand: compose_args.stream_name},
+                    {
+                        operator: "stream",
+                        operand: stream_data.get_stream_name_from_id(compose_args.stream_id),
+                    },
                     {operator: "topic", operand: compose_args.topic},
                 ],
                 {trigger: "restore draft"},
diff --git a/web/src/scheduled_messages_ui.js b/web/src/scheduled_messages_ui.js
index f3fd61147b..1b969b847b 100644
--- a/web/src/scheduled_messages_ui.js
+++ b/web/src/scheduled_messages_ui.js
@@ -21,7 +21,10 @@ function narrow_via_edit_scheduled_message(compose_args) {
     if (compose_args.type === "stream") {
         narrow.activate(
             [
-                {operator: "stream", operand: compose_args.stream},
+                {
+                    operator: "stream",
+                    operand: stream_data.get_stream_name_from_id(compose_args.stream_id),
+                },
                 {operator: "topic", operand: compose_args.topic},
             ],
             {trigger: "edit scheduled message"},
@@ -39,7 +42,6 @@ export function open_scheduled_message_in_compose(scheduled_msg, should_narrow_t
         compose_args = {
             type: "stream",
             stream_id: scheduled_msg.to,
-            stream: stream_data.get_stream_name_from_id(scheduled_msg.to),
             topic: scheduled_msg.topic,
             content: scheduled_msg.content,
         };