diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java
index 38d79deea7..fe5b047c6b 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java
@@ -114,16 +114,13 @@ public class RepackageTask extends DefaultTask {
 		}
 
 		private void setMainClass(Repackager repackager) {
-			String mainClass = (String) getProject().property("mainClassName");
-			if (RepackageTask.this.mainClass != null) {
-				mainClass = RepackageTask.this.mainClass;
-			} else if (this.extension.getMainClass() != null) {
-				mainClass = this.extension.getMainClass();
-			} else if (getProject().getTasks().getByName("run").hasProperty("main")) {
-				mainClass = (String) getProject().getTasks().getByName("run").property("main");
+			repackager.setMainClass((String) getProject().property("mainClassName"));
+			if (this.extension.getMainClass() != null) {
+				repackager.setMainClass(this.extension.getMainClass());
+			}
+			if (RepackageTask.this.mainClass != null) {
+				repackager.setMainClass(RepackageTask.this.mainClass);
 			}
-			getLogger().info("Setting mainClass: " + mainClass);
-			repackager.setMainClass(mainClass);
 		}
 	}