diff --git a/recipes/client.rb b/recipes/client.rb
index 5c1be7d..040cdb1 100644
--- a/recipes/client.rb
+++ b/recipes/client.rb
@@ -20,8 +20,12 @@
 include_recipe "collectd"
 
 servers = []
-search(:node, 'recipes:"collectd::server"') do |n|
-  servers << n['fqdn']
+if Chef::Config[:solo]
+  servers << node['collectd']['master']['ip']
+else
+  search(:node, 'recipes:"collectd::server"') do |n|
+    servers << n['fqdn']
+  end
 end
 
 if servers.empty?