diff --git a/include/bbcode.php b/include/bbcode.php
index a675451f1..70183fda3 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -985,19 +985,22 @@ function bbcode($Text, $options = []) {
 
 	// leave open the posibility of [map=something]
 	// this is replaced in prepare_body() which has knowledge of the item location
-
-	if (! $cache) {
+	if ($cache) {
+		$Text = str_replace([ '[map]','[/map]' ], [ '','' ], $Text);
+		$Text = preg_replace('/[map=(.*?)\]/ism','$1',$Text);
+	}
+	else {
 		if (strpos($Text,'[/map]') !== false) {
 			$Text = preg_replace_callback("/\[map\](.*?)\[\/map\]/ism", 'bb_map_location', $Text);
 		}
 		if (strpos($Text,'[map=') !== false) {
 			$Text = preg_replace_callback("/\[map=(.*?)\]/ism", 'bb_map_coords', $Text);
 		}
+		if (strpos($Text,'[map]') !== false) {
+			$Text = preg_replace("/\[map\]/", '<div class="map"></div>', $Text);
+		}
 	}
-	if (strpos($Text,'[map]') !== false) {
-		$Text = preg_replace("/\[map\]/", '<div class="map"></div>', $Text);
-	}
-
+	
 	// Check for bold text
 	if (strpos($Text,'[b]') !== false) {
 		$Text = preg_replace("(\[b\](.*?)\[\/b\])ism", '<strong>$1</strong>', $Text);