diff --git a/org.eclipse.jdt.debug.tests/java8/ClassWithLambdas.java b/org.eclipse.jdt.debug.tests/java8/ClassWithLambdas.java
index 6ab34763d1..32ba73b923 100644
--- a/org.eclipse.jdt.debug.tests/java8/ClassWithLambdas.java
+++ b/org.eclipse.jdt.debug.tests/java8/ClassWithLambdas.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 IBM Corporation and others.
+ * Copyright (c) 2024 Christian Schima.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
index 40eb3df37d..82ac1f3e6a 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ValidBreakpointLocationLocator.java
@@ -1067,14 +1067,8 @@ public boolean visit(LambdaExpression node) {
 						}
 					}
 
-				// Lambda body can be a block (which is handled above) or an (arbitrary) expression. So maybe the
-				// following cases are insufficient and should be replaced by handling the general
-				// org.eclipse.jdt.core.dom.Expression.
-				} else if (body instanceof LambdaExpression) {
-					body.accept(this);
-				} else if (body instanceof MethodInvocation) {
-					body.accept(this);
-				} else if (body instanceof ClassInstanceCreation) {
+					// Lambda body can be a block (which is handled above) or an (arbitrary) expression.
+				} else if (body instanceof Expression) {
 					body.accept(this);
 				}
 			}