diff --git a/inc/ticket.class.php b/inc/ticket.class.php
index 898271ef..9121f342 100644
--- a/inc/ticket.class.php
+++ b/inc/ticket.class.php
@@ -613,27 +613,7 @@ public static function climb_group($tickets_id, $groups_id, $no_redirect = false
         ];
         if (!$group_ticket->find($condition)) {
             $ticket_group = new Group_Ticket();
-            PluginEscaladeTaskmanager::setTicketTask([
-                'tickets_id' => $tickets_id,
-                'is_private' => true,
-                'state'      => Planning::INFO,
-                'content'    => '<p><i>' . sprintf(
-                    __s('Escalation to the group %s.', 'escalade'),
-                    $group->getName() . '</i></p><hr />',
-                ),
-            ]);
-            $ticket = new Ticket();
-            $ticket->update([
-                'id'      => $tickets_id,
-                '_actors' => [
-                    'assign' => [
-                        [
-                            'items_id' => $groups_id,
-                            'itemtype' => 'Group',
-                        ],
-                    ],
-                ],
-            ]);
+            $ticket_group->add($condition);
         }
 
         if (!$no_redirect) {
diff --git a/tests/Units/TicketTest.php b/tests/Units/TicketTest.php
index bd284550..8f789785 100644
--- a/tests/Units/TicketTest.php
+++ b/tests/Units/TicketTest.php
@@ -288,7 +288,11 @@ public function testTriggerEscalationAndExecuteRuleOnTicket()
                 $this->assertEquals(1, count($user_ticket->find(['tickets_id' => $ticket_id, 'users_id' => $user_tech->getID(), 'type' => CommonITILActor::ASSIGN])));
             }
 
-            $this->assertEquals(1, count($group_ticket->find(['tickets_id' => $ticket_id, 'groups_id' => $group_observer_id, 'type' => CommonITILActor::OBSERVER])));
+            if ($data['method'] == 'escalateWithHistoryButton') {
+                $this->assertEquals(0, count($group_ticket->find(['tickets_id' => $ticket_id, 'groups_id' => $group_observer_id, 'type' => CommonITILActor::OBSERVER])));
+            } else {
+                $this->assertEquals(1, count($group_ticket->find(['tickets_id' => $ticket_id, 'groups_id' => $group_observer_id, 'type' => CommonITILActor::OBSERVER])));
+            }
         }
     }