diff --git a/fs/rpmsgfs/rpmsgfs_client.c b/fs/rpmsgfs/rpmsgfs_client.c
index 48d17e49d17..670031a557d 100644
--- a/fs/rpmsgfs/rpmsgfs_client.c
+++ b/fs/rpmsgfs/rpmsgfs_client.c
@@ -484,7 +484,7 @@ ssize_t rpmsgfs_client_read(FAR void *handle, int fd,
 
 out:
   nxsem_destroy(&cookie.sem);
-  return read.iov_len ? read.iov_len : ret;
+  return read.iov_len > 0 ? read.iov_len : ret;
 }
 
 ssize_t rpmsgfs_client_write(FAR void *handle, int fd,
diff --git a/fs/rpmsgfs/rpmsgfs_server.c b/fs/rpmsgfs/rpmsgfs_server.c
index a93da843354..23175ed49d4 100644
--- a/fs/rpmsgfs/rpmsgfs_server.c
+++ b/fs/rpmsgfs/rpmsgfs_server.c
@@ -378,7 +378,7 @@ static int rpmsgfs_read_handler(FAR struct rpmsg_endpoint *ept,
   while (read < msg->count)
     {
       rsp = rpmsg_get_tx_payload_buffer(ept, &space, true);
-      if (!rsp)
+      if (rsp == NULL)
         {
           return -ENOMEM;
         }