diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb
index 5f358858d..b31ca1e40 100644
--- a/app/controllers/organizations/organization_users_controller.rb
+++ b/app/controllers/organizations/organization_users_controller.rb
@@ -4,12 +4,14 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
 
   def index
     @organization_users = @organization.organization_users.includes(:user)
-    search = params[:search].to_s.downcase
-    user_condition_users = User.like(search).to_sql 
-    team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
-    users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
-   
-    @organization_users = @organization_users.where(user_id: users).distinct
+    if params[:search].present?
+      search = params[:search].to_s.downcase
+      user_condition_users = User.like(search).to_sql
+      team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
+      users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+
+      @organization_users = @organization_users.where(user_id: users).distinct
+    end
 
     @organization_users = kaminari_paginate(@organization_users)
   end