diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
index f19a8a953d..6fd2910f48 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -236,13 +236,9 @@ private void validateUniqueBaseDirs(List<MavenProject> projects) throws MavenExe
 
     private boolean disableLifecycleParticipation(MavenSession session) {
         // command line property to disable Tycho lifecycle participant
-        if ("maven".equals(session.getUserProperties().get("tycho.mode"))) {
-            return true;
-        }
-        if (session.getUserProperties().containsKey("m2e.version")) {
-            return true;
-        }
-        return false;
+        return "maven".equals(session.getUserProperties().get("tycho.mode"))
+                || session.getUserProperties().containsKey("m2e.version")
+                || session.getGoals().equals(List.of("clean")); // disable for clean-only session
     }
 
     private void configureComponents(MavenSession session) {