diff --git a/recipes/client.rb b/recipes/client.rb
index 527109310ab3f780c92f7a8811e526b911f78842..d4f75b2a44e5121bb1b5fcd7707abfe6f8197386 100644
--- a/recipes/client.rb
+++ b/recipes/client.rb
@@ -22,8 +22,11 @@ ossec_server = Array.new
 if node.run_list.roles.include?(node['ossec']['server_role'])
   ossec_server << node['ipaddress']
 else
-  search(:node,"role:#{node['ossec']['server_role']}") do |n|
-    ossec_server << n['ipaddress']
+  if Chef::Config[:solo]
+    Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
+    search(:node,"role:#{node['ossec']['server_role']}") do |n|
+      ossec_server << n['ipaddress']
+    end
   end
 end
 
diff --git a/recipes/server.rb b/recipes/server.rb
index 539155de7e43d39cd13ec25a8924f26860b660c8..8aa9ca0f8161c888451cb7877a4832b2ffd43443 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -28,14 +28,18 @@ agent_manager = "#{node['ossec']['user']['dir']}/bin/ossec-batch-manager.pl"
 
 ssh_hosts = Array.new
 
-search(:node, "ossec:[* TO *] NOT role:#{node['ossec']['server_role']}") do |n|
+if Chef::Config[:solo]
+  Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
+else
+  search(:node, "ossec:[* TO *] NOT role:#{node['ossec']['server_role']}") do |n|
 
-  ssh_hosts << n['ipaddress'] if n['keys']
+    ssh_hosts << n['ipaddress'] if n['keys']
 
-  execute "#{agent_manager} -a --ip #{n['ipaddress']} -n #{n['hostname']}" do
-    not_if "grep '#{n['hostname']} #{n['ipaddress']}' #{node['ossec']['user']['dir']}/etc/client.keys"
-  end
+    execute "#{agent_manager} -a --ip #{n['ipaddress']} -n #{n['hostname']}" do
+      not_if "grep '#{n['hostname']} #{n['ipaddress']}' #{node['ossec']['user']['dir']}/etc/client.keys"
+    end
 
+  end
 end
 
 template "/usr/local/bin/dist-ossec-keys.sh" do