diff --git a/src/agent/agent_loop.rs b/src/agent/agent_loop.rs
index 70546c39..86685c89 100644
--- a/src/agent/agent_loop.rs
+++ b/src/agent/agent_loop.rs
@@ -843,6 +843,8 @@ impl Agent {
             {
                 use crate::agent::session::Thread;
                 let mut sess = session.lock().await;
+                // Bootstrap thread has no incoming message -- use None for
+                // source_channel so approvals from any channel are permitted.
                 let thread = Thread::with_id(id, sess.id, None);
                 sess.active_thread = Some(id);
                 sess.threads.entry(id).or_insert(thread);
@@ -1149,10 +1151,11 @@ impl Agent {
                 .await;
             let mut sess = session.lock().await;
             if let Some(thread) = sess.threads.get(&target_thread_id) {
-                let authorized = thread
-                    .source_channel
-                    .as_ref()
-                    .is_none_or(|src| src == &message.channel || message.channel == "web");
+                let authorized = thread.source_channel.as_ref().map_or(true, |src| {
+                    src == &message.channel
+                        || message.channel == "web"
+                        || message.channel == "gateway"
+                });
                 if !authorized {
                     tracing::warn!(
                         %target_thread_id,
diff --git a/src/agent/thread_ops.rs b/src/agent/thread_ops.rs
index a7f08919..d39f285d 100644
--- a/src/agent/thread_ops.rs
+++ b/src/agent/thread_ops.rs
@@ -141,7 +141,8 @@ impl Agent {
             sess.id
         };
 
-        let mut thread = crate::agent::session::Thread::with_id(thread_uuid, session_id, None);
+        let mut thread =
+            crate::agent::session::Thread::with_id(thread_uuid, session_id, Some(&message.channel));
         if !chat_messages.is_empty() {
             thread.restore_from_messages(chat_messages);
         }