diff --git a/webapp_post.py b/webapp_post.py
index 222f18b29..a589e78e6 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -916,7 +916,9 @@ def _get_like_icon_html(nickname: str, domain_full: str,
     return like_str
 
 
-def _get_bookmark_icon_html(nickname: str, domain_full: str,
+def _get_bookmark_icon_html(base_dir: str,
+                            nickname: str, domain: str,
+                            domain_full: str,
                             post_json_object: {},
                             is_moderation_post: bool,
                             translate: {},
@@ -924,7 +926,8 @@ def _get_bookmark_icon_html(nickname: str, domain_full: str,
                             post_start_time, box_name: str,
                             page_number_param: str,
                             timeline_post_bookmark: str,
-                            first_post_id: str) -> str:
+                            first_post_id: str,
+                            post_url: str) -> str:
     """Returns html for bookmark icon/button
     """
     bookmark_str = ''
@@ -932,6 +935,9 @@ def _get_bookmark_icon_html(nickname: str, domain_full: str,
     if is_moderation_post:
         return bookmark_str
 
+    if not locate_post(base_dir, nickname, domain, post_url):
+        return bookmark_str
+
     bookmark_icon = 'bookmark_inactive.png'
     bookmark_link = 'bookmark'
     bookmark_emoji = ''
@@ -2299,15 +2305,14 @@ def individual_post_as_html(signing_priv_key_pem: str,
     _log_post_timing(enable_timing_log, post_start_time, '12.5')
 
     bookmark_str = \
-        _get_bookmark_icon_html(nickname, domain_full,
-                                post_json_object,
-                                is_moderation_post,
-                                translate,
+        _get_bookmark_icon_html(base_dir, nickname, domain,
+                                domain_full, post_json_object,
+                                is_moderation_post, translate,
                                 enable_timing_log,
                                 post_start_time, box_name,
                                 page_number_param,
                                 timeline_post_bookmark,
-                                first_post_id)
+                                first_post_id, message_id)
 
     _log_post_timing(enable_timing_log, post_start_time, '12.9')
 
@@ -2656,8 +2661,10 @@ def individual_post_as_html(signing_priv_key_pem: str,
                                          translate)
                 if map_str:
                     map_str = '<center>\n' + map_str + '</center>\n'
-        if map_str and post_json_object['object'].get('attributedTo'):
+        attrib = None
+        if post_json_object['object'].get('attributedTo'):
             attrib = post_json_object['object']['attributedTo']
+        if map_str and attrib:
             # is this being sent by the author?
             if '://' + domain_full + '/users/' + nickname in attrib:
                 location_domain = location_str