diff --git a/plugins/eddn.py b/plugins/eddn.py
index 61624246..533fda18 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -613,10 +613,10 @@ def journal_entry(  # noqa: C901
     if (ks := killswitch.get_disabled("plugins.eddn.journal")).disabled:
         logger.warning(f"EDDN journal handler has been disabled via killswitch: {ks.reason}")
         plug.show_error("EDDN journal handler disabled. See Log.")
-        return
-    elif (ks := killswitch.get_disabled(f'plugins.eddn.journal.event{entry["name"]}')).disabled:
-        logger.warning(f'Handling of event {entry["name"]} disabled via killswitch: {ks.reason}')
-        return
+        return None
+    elif (ks := killswitch.get_disabled(f'plugins.eddn.journal.event{entry["event"]}')).disabled:
+        logger.warning(f'Handling of event {entry["event"]} disabled via killswitch: {ks.reason}')
+        return None
 
     # Recursively filter '*_Localised' keys from dict
     def filter_localised(d: Mapping[str, Any]) -> OrderedDictT[str, Any]:
diff --git a/plugins/edsm.py b/plugins/edsm.py
index f3f8479e..2edb62b6 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -343,8 +343,8 @@ def journal_entry(
         logger.warning(f'EDSM Journal handler disabled via killswitch: {ks.reason}')
         plug.show_error('EDSM Handler disabled. See Log.')
         return
-    elif (ks := killswitch.get_disabled(f'plugins.edsm.journal.event.{entry["name"]}')).disabled:
-        logger.warning(f'Handling of event {entry["name"]} has been disabled via killswitch: {ks.reason}')
+    elif (ks := killswitch.get_disabled(f'plugins.edsm.journal.event.{entry["event"]}')).disabled:
+        logger.warning(f'Handling of event {entry["event"]} has been disabled via killswitch: {ks.reason}')
         return
 
     if entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'):
diff --git a/plugins/inara.py b/plugins/inara.py
index f48a9d31..78da5517 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -326,7 +326,8 @@ def journal_entry(
         logger.warning(f'INARA support has been disabled via killswitch: {ks.reason}')
         plug.show_error('INARA disabled. See Log.')
         return
-    elif (ks := killswitch.get_disabled(f''))
+    elif (ks := killswitch.get_disabled(f'plugins.inara.journal.event.{entry["event"]}')).disabled:
+        logger.warning(f'event {entry["event"]} processing has been disabled via killswitch: {ks.reason}')
 
     event_name: str = entry['event']
     this.cmdr = cmdr