diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java
index <HASH>..<HASH> 100644
--- a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java
+++ b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java
@@ -401,9 +401,12 @@ public class Setup extends RapidoidThing implements Constants {
 	public Setup bootstrap(String... args) {
 		this.args(args);
 
-		bootstrapJPA();
+		if (!isAdmin()) {
+			bootstrapJPA();
+			bootstrapControllers();
+		}
+
 		bootstrapGoodies();
-		bootstrapControllers();
 
 		Log.info("Completed bootstrap", "context", getIoCContext());
 		return this;
Disabled JPA bootstrap and component scan for the Admin setup.