diff --git a/activitypub.c b/activitypub.c
index c28e52f..67b4739 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -602,7 +602,7 @@ void notify(snac *snac, const char *type, const char *utype, const char *actor,
     if (strcmp(type, "Follow") == 0)
         objid = id;
 
-    notify_add(snac, type, utype, actor, objid);
+    notify_add(snac, type, utype, actor, objid != NULL ? objid : id);
 }
 
 
diff --git a/html.c b/html.c
index 3e50648..78e164d 100644
--- a/html.c
+++ b/html.c
@@ -1402,7 +1402,7 @@ xs_str *html_notifications(snac *snac)
         const char *utype = xs_dict_get(noti, "utype");
         const char *id    = xs_dict_get(noti, "objid");
 
-        if (!valid_status(object_get(id, &obj)))
+        if (xs_is_null(id) || !valid_status(object_get(id, &obj)))
             continue;
 
         if (is_hidden(snac, id))