diff --git a/src/main/java/org/olat/core/gui/components/link/LinkRenderer.java b/src/main/java/org/olat/core/gui/components/link/LinkRenderer.java
index 6dafc3b23f2612069bc5d48c2e5f362dbd4c78d4..3a75af5f3e13367fa4db9f9cc1590ab565e7f4ce 100644
--- a/src/main/java/org/olat/core/gui/components/link/LinkRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/link/LinkRenderer.java
@@ -189,11 +189,11 @@ public class LinkRenderer extends DefaultComponentRenderer {
 					  .append(";\" ")
 					  .append("onclick=\"return o2cl_dirtyCheckOnly();\" ");
 				} else {
-					String href = StringHelper.containsNonWhitespace(link.getUrl()) ? link.getUrl() : "javascript:;";
+					boolean hasUrl = StringHelper.containsNonWhitespace(link.getUrl());
+					String href = hasUrl ? link.getUrl() : "javascript:;";
 					sb.append("href=\"").append(href).append("\" onclick=\"")
 					  .append(FormJSHelper.getJSFnCallFor(flexiLink.getRootForm(), elementId, 1))
-					  .append(";");
-					sb.append("\" ");
+					  .append("; ").append(" return false;", hasUrl).append("\" ");
 				}
 			} else if(link.isPopup()) {
 				try(StringOutput href = new StringOutput()) {