diff --git a/src/handlers/notify_zulip.rs b/src/handlers/notify_zulip.rs
index 87d0a018..b569832c 100644
--- a/src/handlers/notify_zulip.rs
+++ b/src/handlers/notify_zulip.rs
@@ -159,6 +159,7 @@ pub(super) async fn handle_input<'a>(
 
         msg = msg.replace("{number}", &event.issue.number.to_string());
         msg = msg.replace("{title}", &event.issue.title);
+        msg = replace_team_to_be_nominated(&event.issue.labels, msg);
 
         let zulip_req = crate::zulip::MessageApiRequest {
             recipient: crate::zulip::Recipient::Stream {
@@ -172,3 +173,66 @@ pub(super) async fn handle_input<'a>(
 
     Ok(())
 }
+
+fn replace_team_to_be_nominated(labels: &Vec<Label>, msg: String) -> String {
+    let teams = labels
+        .iter()
+        .map(|label| &label.name)
+        .filter_map(|label| label.strip_prefix("T-"))
+        .collect::<Vec<&str>>();
+
+    // - If a single team label is found, replace the placeholder with that one
+    // - If multiple team labels are found and one of them is "compiler", pick that one
+    //   (currently the only team handling these Zulip notification)
+    // - else, do nothing
+    if teams.len() == 1 {
+        msg.replace("{team}", teams[0])
+    } else if teams.contains(&"compiler") {
+        msg.replace("{team}", "compiler")
+    } else {
+        msg
+    }
+}
+
+#[test]
+fn test_notification() {
+    let mut msg = replace_team_to_be_nominated(&vec![], "Needs `I-{team}-nominated`?".to_string());
+    assert!(msg.contains("Issue needs to be nominated?"), "{}", msg);
+
+    msg = replace_team_to_be_nominated(
+        &vec![Label {
+            name: "T-cooks".to_string(),
+        }],
+        "Needs `I-{team}-nominated`?".to_string(),
+    );
+    assert!(msg.contains("I-cooks-nominated"), "{}", msg);
+
+    msg = replace_team_to_be_nominated(
+        &vec![
+            Label {
+                name: "T-compiler".to_string(),
+            },
+            Label {
+                name: "T-libs".to_string(),
+            },
+            Label {
+                name: "T-cooks".to_string(),
+            },
+        ],
+        "Needs `I-{team}-nominated`?".to_string(),
+    );
+    assert!(msg.contains("I-compiler-nominated"), "{}", msg);
+
+    msg = replace_team_to_be_nominated(
+        &vec![
+            Label {
+                name: "T-libs".to_string(),
+            },
+            Label {
+                name: "T-cooks".to_string(),
+            },
+        ],
+        "Needs `I-{team}-nominated`?".to_string(),
+    );
+    assert!(msg.contains("Issue needs to be nominated?"), "{}", msg);
+}