diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index d6b1fa9..66250b0 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -2957,6 +2957,7 @@ class Bdd {
                     $factureData["client_mail"] = $devis["client_mail"];
                     $factureData["siret"] = $devis["client_legal_one"];
                     $factureData["group_name"] = $devis["client_nom"] ?? "";
+                    $factureData["group_type"] = "single";
                 }
                 else{
                     $factureData["client_real_adress"] = $devis["group_address"] ?? "";
@@ -2965,6 +2966,8 @@ class Bdd {
                     $factureData["siret"] = $devis["group_siret_number"];
                     $factureData["group_name"] = $devis["group_name"] ?? "";
                     $templateType = $devis['fk_template_type_key'] ?? ClientTemplateTypeConstant::PRIVEES;
+                    $factureData["group_type"] = "group";
+
                 }
             }
             $products = $this->getDevisProduits($devis["devis_id"]);
diff --git a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
index 75087cd..1fae1f0 100644
--- a/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
+++ b/gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php
@@ -160,27 +160,41 @@ class InvoiceGroupPdfHandler extends FPDF {
     public function DrawInvoiceClientInfo(){
         $this->SetFont('ComicSans', '', 10);
         $clientName = $this->factureData['group_name'];
-        $clientInfoXAxis = 125;
+        $clientInfoXAxis = 135;
         
         $clientAddress = $this->factureData['client_real_adress'];
         $maxWidth = $this->GetPageWidth();
-        $availableWidhtForClientInfo = $maxWidth - 10 - $clientInfoXAxis;
+        $availableWidhtForClientInfo = $maxWidth - 20 - $clientInfoXAxis;
         
         $clientInfoYAxis = 40;
         $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
         $this->Cell(0, 4, FileExportHelpers::FormatTextForExport($clientName));
         $clientInfoYAxis += 4;
-        $clientAddresses = explode(",",$clientAddress);
-        foreach ($clientAddresses as $address) {
-            $addressWidth = $this->GetStringWidth($address);
+        if ( $this->factureData['group_type'] == 'single' ) {
+            $addressWidth = $this->GetStringWidth($clientAddress);
             $isMultiline = $addressWidth > $availableWidhtForClientInfo;
             $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
-            $this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($address)));
+            $this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($clientAddress)));
+
             if($isMultiline){
                 $clientInfoYAxis += 4;
             }
             $clientInfoYAxis += 4;
+            
+        }else{
+            $clientAddresses = explode(",",$clientAddress);
+            foreach ($clientAddresses as $address) {
+                $addressWidth = $this->GetStringWidth($address);
+                $isMultiline = $addressWidth > $availableWidhtForClientInfo;
+                $this->SetXY($clientInfoXAxis,$clientInfoYAxis);
+                $this->MultiCell( 0, 4, trim(FileExportHelpers::FormatTextForExport($address)));
+                if($isMultiline){
+                    $clientInfoYAxis += 4;
+                }
+                $clientInfoYAxis += 4;
+            }
         }
+        
         $this->SetXY($clientInfoXAxis,$clientInfoYAxis + 1);
         $this->Cell(0, 4, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
     }