diff --git a/app/models/student.rb b/app/models/student.rb
index 5ba7dd49d..8e3f22aab 100644
--- a/app/models/student.rb
+++ b/app/models/student.rb
@@ -98,11 +98,11 @@ def transferred?
   end
 
   def multiple_mefs?
-    classes.joins(:mef).select(:"mefs.id").distinct.count > 1
+    classes.current.joins(:mef).select(:"mefs.id").distinct.count > 1
   end
 
   def multiple_establishments?
-    classes.select(:establishment_id).distinct.count > 1
+    classes.current.select(:establishment_id).distinct.count > 1
   end
 
   def any_classes_in_establishment?(establishment)