diff --git a/userspace/sysdig/csysdig.cpp b/userspace/sysdig/csysdig.cpp
index 89be2aa506..2a098c9e06 100644
--- a/userspace/sysdig/csysdig.cpp
+++ b/userspace/sysdig/csysdig.cpp
@@ -283,7 +283,17 @@ captureinfo do_inspect(sinsp* inspector,
 
         syslog_decoder->reset();
 		res = inspector->next(&ev);
-        syslog_decoder->parse(ev);
+        if (ev)
+        {
+            const uint16_t etype = ev->get_scap_evt()->type;
+            if (etype == PPME_SYSCALL_WRITE_X || etype == PPME_SYSCALL_WRITEV_X ||
+                etype == PPME_SYSCALL_PWRITE_X || etype == PPME_SYSCALL_PWRITEV_X ||
+                etype == PPME_SOCKET_SEND_X || etype == PPME_SOCKET_SENDTO_X ||
+                etype == PPME_SOCKET_SENDMSG_X || etype == PPME_SOCKET_SENDMMSG_X)
+            {
+                syslog_decoder->parse(ev);
+            }
+        }
 
 		if(res == SCAP_TIMEOUT || res == SCAP_FILTERED_EVENT)
 		{
diff --git a/userspace/sysdig/sysdig.cpp b/userspace/sysdig/sysdig.cpp
index 1ba3d31ec6..f02c5c6780 100644
--- a/userspace/sysdig/sysdig.cpp
+++ b/userspace/sysdig/sysdig.cpp
@@ -745,7 +745,17 @@ captureinfo do_inspect(sinsp *inspector, sinsp_cycledumper *dumper,
 		}
         syslog_decoder->reset();
 		res = inspector->next(&ev);
-        syslog_decoder->parse(ev);
+        if (ev)
+        {
+            const uint16_t etype = ev->get_scap_evt()->type;
+            if (etype == PPME_SYSCALL_WRITE_X || etype == PPME_SYSCALL_WRITEV_X ||
+                etype == PPME_SYSCALL_PWRITE_X || etype == PPME_SYSCALL_PWRITEV_X ||
+                etype == PPME_SOCKET_SEND_X || etype == PPME_SOCKET_SENDTO_X ||
+                etype == PPME_SOCKET_SENDMSG_X || etype == PPME_SOCKET_SENDMMSG_X)
+            {
+                syslog_decoder->parse(ev);
+            }
+        }
 
 		if(dumper && ev && res != SCAP_EOF)
 		{
diff --git a/userspace/sysdig/utils/sinsp_syslog.cpp b/userspace/sysdig/utils/sinsp_syslog.cpp
index 7d36a2ee36..b247a3fcc7 100644
--- a/userspace/sysdig/utils/sinsp_syslog.cpp
+++ b/userspace/sysdig/utils/sinsp_syslog.cpp
@@ -76,34 +76,31 @@ std::string sinsp_syslog_decoder::get_info_line() const {
 }
 
 void sinsp_syslog_decoder::parse(sinsp_evt* evt) {
-	if(!evt || !evt->get_fd_info()) {
+	const sinsp_evt_param *parinfo = nullptr;
+	uint16_t etype = evt->get_scap_evt()->type;
+
+	if((etype == PPME_SOCKET_SENDMMSG_X) &&
+	   evt->get_num_params() == 0) {
 		return;
 	}
 
+    if (evt->get_syscall_return_value() < 0) {
+        return;
+    }
+    
 	// Check if this is a syslog fd
-	if(!evt->get_fd_info()->is_syslog()) {
+	if(evt->get_fd_info() == nullptr || !evt->get_fd_info()->is_syslog()) {
 		return;
 	}
 
-	// Extract the data buffer based on event type
-	uint16_t etype = evt->get_type();
-	const sinsp_evt_param* parinfo = nullptr;
-
 	// Determine which parameter contains the data based on event type
-	if(etype == PPME_SOCKET_SENDMMSG_X) {
-		parinfo = evt->get_param(2);
-	} else if(etype == PPME_SYSCALL_READV_X || etype == PPME_SYSCALL_PREADV_X ||
-	          etype == PPME_SOCKET_RECVMSG_X) {
-		parinfo = evt->get_param(2);
-	} else if(etype == PPME_SOCKET_RECVMMSG_X) {
-		parinfo = evt->get_param(3);
-	} else {
-		parinfo = evt->get_param(1);
-	}
-
-	if(parinfo) {
-		const char* data = parinfo->m_val;
-		uint32_t datalen = parinfo->m_len;
-		parse_data(data, datalen);
-	}
+    if(etype == PPME_SOCKET_SENDMMSG_X) {
+        parinfo = evt->get_param(3);
+    } else {
+        parinfo = evt->get_param(1);
+    }
+
+    const char* data = parinfo->m_val;
+    uint32_t datalen = parinfo->m_len;
+    parse_data(data, datalen);
 }