diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java
index 40e573a11..ac39958cb 100644
--- a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java
+++ b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java
@@ -107,9 +107,8 @@ public static StepEventBus eventBusFor(Object key) {
         if (key == null) {
             return new SilentEventBus(ConfiguredEnvironment.getEnvironmentVariables());
         }
-        STICKY_EVENT_BUSES.putIfAbsent(key, new StepEventBus(ConfiguredEnvironment.getEnvironmentVariables(),
-                ConfiguredEnvironment.getConfiguration()));
-        return STICKY_EVENT_BUSES.get(key);
+        return STICKY_EVENT_BUSES.computeIfAbsent(key, (unused) -> new StepEventBus(
+                ConfiguredEnvironment.getEnvironmentVariables(), ConfiguredEnvironment.getConfiguration()));
     }
 
     public static void setCurrentBusToEventBusFor(Object key) {