diff --git a/command_table.cpp b/command_table.cpp
index 3dc531a..6779d55 100644
--- a/command_table.cpp
+++ b/command_table.cpp
@@ -52,6 +52,16 @@
     {
         CommandID command(inCommand);
 
+        // Do not forward any session zero commands to ipmid
+        if (handler->sessionID == session::sessionZero)
+        {
+            log<level::INFO>("Table: refuse to forward session-zero command",
+                             entry("LUN=%x", command.lun()),
+                             entry("NETFN=%x", command.netFn()),
+                             entry("CMD=%x", command.cmd()));
+            return;
+        }
+
         auto bus = getSdBus();
         // forward the request onto the main ipmi queue
         using IpmiDbusRspType = std::tuple<uint8_t, uint8_t, uint8_t, uint8_t,
diff --git a/message_parsers.cpp b/message_parsers.cpp
index b3d8dbd..7b8d832 100644
--- a/message_parsers.cpp
+++ b/message_parsers.cpp
@@ -100,12 +100,18 @@
         throw std::runtime_error("IPMI1.5 Session Header Missing");
     }
 
-    auto message = std::make_shared<Message>();
-
     auto header = reinterpret_cast<SessionHeader_t*>(inPacket.data());
 
+    uint32_t sessionID = endian::from_ipmi(header->sessId);
+    if (sessionID != session::sessionZero)
+    {
+        throw std::runtime_error("IPMI1.5 session packets are unsupported");
+    }
+
+    auto message = std::make_shared<Message>();
+
     message->payloadType = PayloadType::IPMI;
-    message->bmcSessionID = endian::from_ipmi(header->sessId);
+    message->bmcSessionID = session::sessionZero;
     message->sessionSeqNum = endian::from_ipmi(header->sessSeqNum);
     message->isPacketEncrypted = false;
     message->isPacketAuthenticated = false;