diff --git a/.yardopts b/.yardopts
index bdaea9804..f03645226 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1,9 +1,7 @@
 --title "Releaf documentation"
 --protected
 --output-dir api
-# WORKAROUND for: https://github.com/lsegal/yard/issues/825
---legacy
-
+--plugin activerecord
 
 releaf-permissions/app/**/*.rb
 releaf-permissions/lib/**/*.rb
diff --git a/Gemfile b/Gemfile
index 31853745d..cf839d06e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,4 +28,5 @@ group :documentation do
   gem 'yard'
   gem 'github-markdown', '>= 0.5.3'
   gem 'redcarpet', '>= 2.2.2'
+  gem 'yard-activerecord', '~> 0.0.14'
 end