diff --git a/lib/jabber.php b/lib/jabber.php
index 01ec8da439..1202aa3222 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -271,8 +271,9 @@ function jabber_broadcast_notice($notice) {
 	$public = common_config('xmpp', 'public');
 	
 	# FIXME PRIV don't send out private messages here
+	# XXX: should we send out non-local messages if public,localonly = false? I think not
 	
-	if ($public) {
+	if ($public && $notice->is_local) {
 		foreach ($public as $address) {
 				common_log(LOG_INFO,
 						   'Sending notice ' . $notice->id . ' to public listener ' . $address,