diff --git a/mod/item.php b/mod/item.php
index 82fb0bf72..c30b17457 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -447,7 +447,7 @@ function item_post(&$a) {
 
 	if(count($tags)) {
 		foreach($tags as $tag) {
-			handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); 
+			handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); 
 		}
 	}