diff --git a/include/sdbusplus/message.hpp b/include/sdbusplus/message.hpp
index 93e0923..4e5f790 100644
--- a/include/sdbusplus/message.hpp
+++ b/include/sdbusplus/message.hpp
@@ -167,6 +167,14 @@
     {
         if constexpr (sizeof...(Args) == 0)
         {
+            // No args
+            return;
+        }
+        else if constexpr (sizeof...(Args) == 1 &&
+                           std::is_void_v<
+                               std::tuple_element_t<0, std::tuple<Args...>>>)
+        {
+            // Args is void
             return;
         }
         else if constexpr (sizeof...(Args) == 1)
diff --git a/test/message/read.cpp b/test/message/read.cpp
index c930372..9dbdbf1 100644
--- a/test/message/read.cpp
+++ b/test/message/read.cpp
@@ -715,4 +715,10 @@
     EXPECT_EQ(tisb, std::make_tuple(ret_ti, ret_ts, ret_tb));
 }
 
+TEST_F(ReadTest, UnpackVoid)
+{
+    new_message().unpack<>();
+    new_message().unpack<void>();
+}
+
 } // namespace