diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb816da9d1..abbbf334fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+* Update dependency io.cucumber:html-formatter to v18 ([#2476](https://github.com/cucumber/cucumber-jvm/pull/2476) M.P. Korstanje)
+  - Removed work around for 'Uncaught TypeError: e.git is undefined'    
 
 ### Deprecated
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 1681ccee0d..3540092fb0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -15,7 +15,7 @@
         <ci-environment.version>8.1.0</ci-environment.version>
         <cucumber-expressions.version>15.0.1</cucumber-expressions.version>
         <datatable.version>4.1.0</datatable.version>
-        <html-formatter.version>17.0.0</html-formatter.version>
+        <html-formatter.version>18.0.0</html-formatter.version>
         <tag-expressions.version>4.1.0</tag-expressions.version>
     </properties>
 
diff --git a/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java b/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java
index 28183e21a9..26cc6fc586 100644
--- a/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java
+++ b/core/src/main/java/io/cucumber/core/runtime/CucumberExecutionContext.java
@@ -74,16 +74,11 @@ private Ci createCi() {
             return null;
         }
 
-        Git git = createGit(ciEnvironment.getGit());
-        if (git == null) {
-            return null;
-        }
-
         return new Ci(
             ciEnvironment.getName(),
             ciEnvironment.getUrl(),
             ciEnvironment.getBuildNumber(),
-            git);
+            createGit(ciEnvironment.getGit()));
     }
 
     private Git createGit(CiEnvironment.Git ciGit) {