diff --git a/classes/order/Order.php b/classes/order/Order.php
index 7e72ee35f..91dc329e3 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -830,7 +830,7 @@ class OrderCore extends ObjectModel
 		foreach ($res as $key => $val)
 		{
 			$res2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
-				SELECT os.`id_order_state`, osl.`name` AS order_state, os.`invoice`
+				SELECT os.`id_order_state`, osl.`name` AS order_state, os.`invoice`, os.`color` as order_state_color
 				FROM `'._DB_PREFIX_.'order_history` oh
 				LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`)
 				INNER JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)$context->language->id.')
diff --git a/themes/default-bootstrap/history.tpl b/themes/default-bootstrap/history.tpl
index a9ed37935..9cda53fba 100644
--- a/themes/default-bootstrap/history.tpl
+++ b/themes/default-bootstrap/history.tpl
@@ -87,7 +87,7 @@
 						<td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td>
 						<td data-value="{$order.id_order_state}" class="history_state">
 							{if isset($order.order_state)}
-								<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">
+								<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}" {if $order.id_order_state > 12}style="background-color:{$order.order_state_color};"{/if}>
 									{$order.order_state|escape:'html':'UTF-8'}
 								</span>
 							{/if}