diff --git a/lib/forest_liana/active_record_override.rb b/lib/forest_liana/active_record_override.rb
index 08e53c06..e23a9a32 100644
--- a/lib/forest_liana/active_record_override.rb
+++ b/lib/forest_liana/active_record_override.rb
@@ -33,7 +33,7 @@ def apply_column_aliases(relation)
               keys = [join_part.base_klass.primary_key] # Always include the primary key
 
               # # %%% Optional to include all foreign keys:
-              # keys.concat(join_part.base_klass.reflect_on_all_associations.select { |a| a.belongs_to? }.map(&:foreign_key))
+              keys.concat(join_part.base_klass.reflect_on_all_associations.select { |a| a.belongs_to? }.map(&:foreign_key)).compact.uniq
               # Add foreign keys out to referenced tables that we belongs_to
               join_part.children.each { |child| keys << child.reflection.foreign_key if child.reflection.belongs_to? }