diff --git a/include/tags.php b/include/tags.php
index fc1b57db4b..a8bcae86dc 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -37,6 +37,9 @@ function create_tags_from_item($itemid) {
 
 	$data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
 
+	// ignore anything in a code block
+	$data = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$data);
+
 	$tags = array();
 
 	$pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";