diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 19568e5dc2..962e2128b2 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1124,6 +1124,13 @@ function map_meta_cap( $cap, $user_id ) {
 		else
 			$caps[] = 'do_not_allow';
 		break;
+	case 'unfiltered_html' :
+		// Disallow unfiltered_html for all users, even admins and super admins.
+		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+			$caps[] = 'do_not_allow';
+		else
+			$caps[] = $cap;
+		break;
 	case 'edit_files':
 	case 'edit_plugins':
 	case 'edit_themes':
@@ -1146,13 +1153,6 @@ function map_meta_cap( $cap, $user_id ) {
 			break;
 		}
 		// Fall through if not DISALLOW_FILE_MODS.
-	case 'unfiltered_html':
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
-		// Fall through if not DISALLOW_UNFILTERED_HTML
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite these caps are allowed only for super admins.