diff --git a/miniserv.pl b/miniserv.pl
index 2ed52e0d4..863dd7e4a 100755
--- a/miniserv.pl
+++ b/miniserv.pl
@@ -2457,10 +2457,7 @@ if (&get_type($full) eq "internal/cgi" && $validated != 4) {
 	$ENV{"SSL_USER"} = $peername if ($validated == 2);
 	$ENV{"ANONYMOUS_USER"} = "1" if ($validated == 3 || $validated == 4);
 	$ENV{"DOCUMENT_ROOT"} = $roots[0];
-	$ENV{"THEME_ROOT"} = "$roots[0]/" .
-	                     ($config{"preroot_$ENV{'BASE_REMOTE_USER'}"} ||
-	                      $config{"preroot_$ENV{'REMOTE_USER'}"} ||
-	                      $config{"preroot"});
+	$ENV{"THEME_ROOT"} = $preroots[0];
 	$ENV{"DOCUMENT_REALROOT"} = $realroot;
 	$ENV{"GATEWAY_INTERFACE"} = "CGI/1.1";
 	$ENV{"SERVER_PROTOCOL"} = "HTTP/1.0";