diff --git a/lib/stream.php b/lib/stream.php
index 64dbcbce36..b94033d6a0 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -96,6 +96,10 @@ class StreamAction extends Action {
 		}
 		common_element_end('p');
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		# XXX: we need to figure this out better
+		if ($notice->uri != $noticeurl && preg_match('/^http/', $notice->uri)) {
+			$noticeurl = $notice->uri;
+		}
 		common_element_start('p', 'time');
 		common_element('a', array('class' => 'permalink',
 								  'href' => $noticeurl,