diff --git a/src/Traits/WithColumnSelect.php b/src/Traits/WithColumnSelect.php
index a26dcb85c..7079f47d6 100644
--- a/src/Traits/WithColumnSelect.php
+++ b/src/Traits/WithColumnSelect.php
@@ -63,7 +63,10 @@ public function getDefaultVisibleColumns(): array
 
     public function selectAllColumns()
     {
-        $this->{$this->tableName}['columns'] = [];
+        $this->selectedColumns = $this->getColumns()->map(function ($column) {
+            return $column->getSlug();
+        })->toArray();
+        $this->{$this->tableName}['columns'] = $this->selectedColumns;
         $this->forgetColumnSelectSession();
         event(new ColumnsSelected($this->getColumnSelectSessionKey(), $this->selectedColumns));
     }
diff --git a/tests/Events/ColumnsSelectedTest.php b/tests/Events/ColumnsSelectedTest.php
index 03f0b1cef..2bd03f75e 100644
--- a/tests/Events/ColumnsSelectedTest.php
+++ b/tests/Events/ColumnsSelectedTest.php
@@ -14,7 +14,9 @@ public function an_event_is_emitted_when_a_column_selection_are_updated()
             ColumnsSelected::class,
         ]);
 
-        $test['columns'] = $this->basicTable->selectedColumns;
+        $test['columns'] = $this->basicTable->getColumns()->map(function ($column) {
+            return $column->getSlug();
+        })->toArray();
         $test['key'] = $this->basicTable->getDataTableFingerprint().'-columnSelectEnabled';
 
         // Select all columns to test event trigger