diff --git a/src/Scopes/DecryptSelectScope.php b/src/Scopes/DecryptSelectScope.php
index 92158c5..537c91b 100644
--- a/src/Scopes/DecryptSelectScope.php
+++ b/src/Scopes/DecryptSelectScope.php
@@ -18,25 +18,16 @@ class DecryptSelectScope implements Scope
      */
     public function apply(Builder $builder, Model $model)
     {
-        $columns = [];
-        $query = $builder->getQuery();
-
-        if (isset($query)) {
-            $columns = $query->columns;
-        }
+        $columns = $builder->getQuery()->columns;
 
         $encryptable = $model->encryptable();
 
         $columns = empty($columns) ? Schema::getColumnListing($model->getTable()) : $columns;
 
-        if (empty($encryptable) || empty($columns)) {
-            return $builder->addSelect(...$columns);
-        }
-
         $select = collect($columns)->map(function ($column) use ($encryptable) {
             return (in_array($column, $encryptable)) ? db_decrypt($column) : $column;
         });
 
-        return $builder->addSelect(...$select);
+        return $builder->select(...$select);
     }
 }