diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 5f31c550a..d3504dd1d 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -690,7 +690,7 @@ function script_concat_settings() {
 
 	if ( ! isset($concatenate_scripts) ) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ! is_admin() || ( $concatenate_scripts && -1 == get_user_option('concatenate_scripts') ) )
+		if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
 			$concatenate_scripts = false;
 	}