diff --git a/CHANGES.rst b/CHANGES.rst
index b41f51ae4e3de2593603108ff086a0c03aacbde3..3459ef337cdb6167ae9fa754498174f23b6282ca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.0.6 (unreleased)
 ------------------
 
--   No changes yet
+-   Prevent external event switching superevents also when triggering
+    off superevents. 
 
 2.0.5 "Mothman" (2023-04-20)
 ----------------------------
diff --git a/gwcelery/tasks/raven.py b/gwcelery/tasks/raven.py
index 8830003faace8b873fb72edc2caf3f9f84ef837d..c1129ce237995a284060b265ed9d61ce0da18b44 100644
--- a/gwcelery/tasks/raven.py
+++ b/gwcelery/tasks/raven.py
@@ -221,10 +221,10 @@ def raven_pipeline(raven_search_results, gracedb_id, alert_object, tl, th,
             exttrig_id = gracedb_id
             superevent = result
             ext_event = alert_object
-            # Don't continue if it is a different superevent than previous one.
-            if ext_event['superevent'] is not None \
-                    and ext_event['superevent'] != superevent['superevent_id']:
-                return
+        # Don't continue if it is a different superevent than previous one.
+        if ext_event['superevent'] is not None \
+                and ext_event['superevent'] != superevent['superevent_id']:
+            return
 
         canvas = (
             gracedb.add_event_to_superevent.si(superevent_id, exttrig_id)
diff --git a/gwcelery/tests/test_tasks_raven.py b/gwcelery/tests/test_tasks_raven.py
index 8063b8c75de497a9ca9576d95c083daa6d384ed8..35ab16d7639f4f98e4514dd6afc5910548169533 100644
--- a/gwcelery/tests/test_tasks_raven.py
+++ b/gwcelery/tests/test_tasks_raven.py
@@ -284,6 +284,8 @@ def test_raven_pipeline(mock_plot_overlap_integral,
         alert_object['time_coinc_far'] = 1e-5
         alert_object['space_coinc_far'] = None
         alert_object['overlap_integral'] = None
+        for result in raven_search_results:
+            result['superevent'] = None
     raven.raven_pipeline(raven_search_results, graceid, alert_object, tl, th,
                          group)