diff --git a/socle b/socle
index a951da6..ea4ed47 160000
--- a/socle
+++ b/socle
@@ -1 +1 @@
-Subproject commit a951da62d173a3890e1321f76f9110f78cc7879b
+Subproject commit ea4ed479d1cd8d2beddd3ef450443a206cdb4cc9
diff --git a/src/proxy/mitmproxy.cpp b/src/proxy/mitmproxy.cpp
index 61f0ee3..1580008 100644
--- a/src/proxy/mitmproxy.cpp
+++ b/src/proxy/mitmproxy.cpp
@@ -62,6 +62,7 @@
 #include <algorithm>
 
 #include <socle/common/base64.hpp>
+#include <socle/timed_guard.hpp>
 
 using namespace socle;
 
@@ -1044,13 +1045,40 @@ bool MitmProxy::handle_content_webhook(baseHostCX* from, baseHostCX* to, side_t
             }
         }
 
-        // traffic with applied webhook with enabled locking will block here
-        auto lc_ = std::scoped_lock(MitmProxy::Opts_ContentWriter::webhook_content_lock);
-        return content_webhook(from, side, from->to_read());
+        constexpr unsigned max_attempts = 3;
+        constexpr unsigned lock_timeout = 1000;
+        for(unsigned attempt_no = 1; attempt_no < max_attempts; ++attempt_no) {
+
+            // traffic with applied webhook with enabled locking will block here
+            auto lc_ = socle::threads::timed_guard(MitmProxy::Opts_ContentWriter::webhook_content_lock,
+                                                   std::chrono::milliseconds(lock_timeout));
+            if (not lc_.owns_lock()) {
+                _war("[%s]: content_webhook: waiting for other content webhook to finish (attempt %d)",
+                     to_string(iNOT).c_str(), attempt_no);
+                log.event(WAR, "[%s]: content_webhook: waiting for other content webhook to finish (attempt %d)",
+                     to_string(iNOT).c_str(), attempt_no);
+            }
+            else {
+                if(attempt_no > 1) {
+                    _war("[%s]: content_webhook: webhook is ready now (attempt %d)",
+                         to_string(iNOT).c_str(), attempt_no);
+                    log.event(WAR, "[%s]: content_webhook: webhook is ready now (attempt %d)",
+                         to_string(iNOT).c_str(), attempt_no);
+
+                }
+                return content_webhook(from, side, from->to_read());
+            }
+        }
+        _err("[%s]: content_webhook: previous webhook takes too long to complete, content NOT sent to webhook.",
+             to_string(iNOT).c_str());
+        log.event(ERR, "[%s]: content_webhook: previous webhook takes too long to complete, content NOT sent to webhook.",
+             to_string(iNOT).c_str());
+
     }
     else {
         return content_webhook(from, side, from->to_read());
     }
+    return false;
 }
 
 void MitmProxy::proxy(baseHostCX* from, baseHostCX* to, side_t side, bool redirected) {
diff --git a/src/proxy/mitmproxy.hpp b/src/proxy/mitmproxy.hpp
index 247c75d..8c25671 100644
--- a/src/proxy/mitmproxy.hpp
+++ b/src/proxy/mitmproxy.hpp
@@ -113,7 +113,7 @@ class MitmProxy : public baseProxy, public socle::sobject, public IOController {
         bool webhook_lock_traffic = false;
 
         // if configured, all proxies will lock on this mutex (it's optional)
-        static inline std::mutex webhook_content_lock;
+        static inline std::timed_mutex webhook_content_lock;
 
     };
     lazy_ptr<Opts_ContentWriter> writer_opts_;