diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py
index 66242ebff..f947a4fb0 100644
--- a/taskcluster/fenix_taskgraph/target_tasks.py
+++ b/taskcluster/fenix_taskgraph/target_tasks.py
@@ -21,6 +21,12 @@ def target_tasks_default(full_task_graph, parameters, graph_config):
 
     # TODO Use shipping-phase once we retire github-releases
     def filter(task, parameters):
+        # Mark-as-shipped is always red on github-release and it confuses people.
+        # This task cannot be green if we kick off a release through github-releases, so
+        # let's exlude that task there.
+        if task.kind == "mark-as-shipped" and parameters["tasks_for"] == "github-release":
+            return False
+
         return task.attributes.get("release-type", "") == parameters["release_type"]
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]