diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 1a78c1082..abe4f1452 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -984,7 +984,6 @@
     "WebGUI::Content::Maintenance",
     "WebGUI::Content::Referral",
     "WebGUI::Content::Admin",
-    "WebGUI::Content::AssetManager",
     "WebGUI::Content::AssetDiscovery",
     "WebGUI::Content::PassiveAnalytics",
     "WebGUI::Content::SetLanguage",
diff --git a/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl b/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl
index e900462e3..5b557afb2 100644
--- a/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl
+++ b/share/upgrades/7.10.4-8.0.0/addNewAdminConsole.pl
@@ -12,6 +12,9 @@ session->config->addToArrayAfter(
 session->config->deleteFromHash( 'adminConsole', 'adminConsoleOff' );
 session->config->deleteFromHash( 'adminConsole', 'assets' );
 
+# Remove old admin handlers
+session->config->deleteFromArray( 'contentHandlers', 'WebGUI::Content::AssetManager' );
+
 # Add template setting
 session->setting->set( 'templateIdAdmin' => 'p8g7xlQaTeKSRRDo-_ejSQ' );