diff --git a/aya-log-common/src/lib.rs b/aya-log-common/src/lib.rs
index b30fafc7..5a0bd419 100644
--- a/aya-log-common/src/lib.rs
+++ b/aya-log-common/src/lib.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-pub const LOG_BUF_CAPACITY: usize = 1024;
+pub const LOG_BUF_CAPACITY: usize = 8192;
 
 pub const LOG_FIELDS: usize = 7;
 
diff --git a/ebpf/aya-log-ebpf-macros/src/expand.rs b/ebpf/aya-log-ebpf-macros/src/expand.rs
index 5ff93aac..f0cfc62e 100644
--- a/ebpf/aya-log-ebpf-macros/src/expand.rs
+++ b/ebpf/aya-log-ebpf-macros/src/expand.rs
@@ -92,6 +92,9 @@ pub(crate) fn log(args: LogArgs, level: Option<TokenStream>) -> Result<TokenStre
             let write_args = quote! {{
                 use ::aya_log_ebpf::WriteToBuf;
                 Ok::<_, ()>(record_len) #( .and_then(|record_len| {
+                    if record_len >= buf.buf.len() {
+                        return Err(());
+                    }
                     { #formatting_exprs }.write(&mut buf.buf[record_len..]).map(|len| record_len + len)
                 }) )*
             }};