diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 523da47191d..76d8e4f8d79 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -129,7 +129,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
 		$search = $this->prefix."____-%";
 		$sql .= " WHERE ref LIKE '".$db->escape($search)."'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " AND entity IN (".getEntity('ticketnumber', 1, $ticket).")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 176af782dc7..2c46376eea1 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -134,8 +134,11 @@ class mod_ticket_universal extends ModeleNumRefTicket
 			return 0;
 		}
 
+		// Get entities
+		$entity = getEntity('ticketnumber', 1, $ticket);
+
 		$date = empty($ticket->datec) ? dol_now() : $ticket->datec;
-		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
+		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date, 'next', false, null, $entity);
 
 		return $numFinal;
 	}