2 files changed, 4 insertions, 3 deletions

diff --git a/activitypub.c b/activitypub.c
index fb0c42c..ab63abe 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -2769,7 +2769,7 @@ void process_user_queue_item(snac *user, xs_dict *q_item)
     if (strcmp(type, "notify_webhook") == 0) {
         const char *webhook = xs_dict_get(user->config, "notify_webhook");
 
-        if (xs_is_string(webhook)) {
+        if (xs_is_string(webhook) && *webhook) {
             const xs_dict *msg = xs_dict_get(q_item, "message");
             int retries = xs_number_get(xs_dict_get(q_item, "retries"));
 
diff --git a/data.c b/data.c
index 10084f9..74bc112 100644
--- a/data.c
+++ b/data.c
@@ -3167,7 +3167,8 @@ void notify_add(snac *snac, const char *type, const char *utype,
         pthread_mutex_unlock(&data_mutex);
     }
 
-    enqueue_notify_webhook(snac, noti, 0);
+    if (!xs_is_true(xs_dict_get(srv_config, "disable_notify_webhook")))
+        enqueue_notify_webhook(snac, noti, 0);
 }
 
 
@@ -3528,7 +3529,7 @@ void enqueue_notify_webhook(snac *user, const xs_dict *noti, int retries)
 {
     const char *webhook = xs_dict_get(user->config, "notify_webhook");
 
-    if (xs_is_string(webhook)) {
+    if (xs_is_string(webhook) && *webhook) {
         xs *msg = xs_dup(noti);
 
         /* add more data */