diff --git a/models/site.rb b/models/site.rb
index a9e5aeb4..45189af6 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -319,7 +319,7 @@ class Site < Sequel::Model
   end
 
   def is_following?(site)
-    followings_dataset.select(:id).filter(site_id: site.id).first ? true : false
+    followings_dataset.select(:follows__id).filter(site_id: site.id).first ? true : false
   end
 
   def toggle_follow(site)
@@ -468,6 +468,16 @@ class Site < Sequel::Model
     }
   end
 
+  # Who this site follows
+  def followings_dataset
+    super.select_all(:follows).inner_join(:sites, :id=>:site_id).exclude(:sites__is_deleted => true).exclude(:sites__is_banned => true).exclude(:sites__is_crashing => true)
+  end
+
+  # Who this site is following
+  def follows_dataset
+    super.select_all(:follows).inner_join(:sites, :id=>:actioning_site_id).exclude(:sites__is_deleted => true).exclude(:sites__is_banned => true).exclude(:sites__is_crashing => true)
+  end
+
 =begin
   def follows_dataset
     super.where(Sequel.~(site_id: blocking_site_ids))