diff --git a/roles/collectd/fedmsg-activation/files/fedmsg-activation.conf b/roles/collectd/fedmsg-activation/files/fedmsg-activation.conf
index a682c3a3bb..b19eb52514 100644
--- a/roles/collectd/fedmsg-activation/files/fedmsg-activation.conf
+++ b/roles/collectd/fedmsg-activation/files/fedmsg-activation.conf
@@ -1,4 +1,4 @@
 LoadPlugin exec
 <Plugin exec>
-    Exec "fedmsg" "/usr/local/bin/fedmsg-map collectd"
+    Exec "fedmsg" "/usr/local/bin/fedmsg-map"
 </Plugin>
diff --git a/roles/collectd/fedmsg-activation/files/fedmsg-map.py b/roles/collectd/fedmsg-activation/files/fedmsg-map.py
index a91bebc752..792a2d7a53 100644
--- a/roles/collectd/fedmsg-activation/files/fedmsg-map.py
+++ b/roles/collectd/fedmsg-activation/files/fedmsg-map.py
@@ -19,7 +19,7 @@ expected = '/wAAAAAAAAABfw=='
 active = collections.defaultdict(list)
 inactive = collections.defaultdict(list)
 
-for_collectd = 'collectd' in sys.argv
+for_collectd = 'verbose' not in sys.argv
 
 
 def info(content="\n"):