diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index 1cc8770bd352bc4f766102f6c31ab7124a39831e..075b7d2b4c118c85aa3cc725d8aa08885fd309c8 100644
--- a/app/controllers/admin/university/organizations_controller.rb
+++ b/app/controllers/admin/university/organizations_controller.rb
@@ -27,10 +27,14 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
 
   def search
     @term = params[:term].to_s
+    language = Language.find_by(iso_code: params[:lang])
     @organizations = current_university.organizations
-                                        .for_language_id(current_university.default_language_id)
                                         .search_by_siren_or_name(@term)
                                         .ordered
+    @organizations = @organizations.joins(:language)
+                                    .where(languages: { 
+                                      iso_code: language.iso_code 
+                                    }) if language.present?
   end
 
   def show