diff --git a/ffplayout/src/main.rs b/ffplayout/src/main.rs
index 20db55e3..8655658c 100644
--- a/ffplayout/src/main.rs
+++ b/ffplayout/src/main.rs
@@ -238,6 +238,12 @@ async fn main() -> std::io::Result<()> {
             let manager = ChannelManager::new(Some(pool.clone()), channel.clone(), config.clone());
 
             if ARGS.foreground {
+                if ARGS.channels.is_none() {
+                    error!(
+                        "Foreground mode needs at least 1 channel, run with `--channels (1 2 ...)`"
+                    );
+                    exit(1);
+                }
                 let m_queue = Arc::new(Mutex::new(MailQueue::new(*channel_id, config.mail)));
 
                 channel_controllers
diff --git a/frontend b/frontend
index c0d6f02d..aa328650 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit c0d6f02d739f8554cf3a6c4ee090f8b346b26e31
+Subproject commit aa32865049996017c0c42df7e2c62c5210e153ab