diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
index b1d2904..8431dda 100644
--- a/pldmd/pldmd.cpp
+++ b/pldmd/pldmd.cpp
@@ -223,9 +223,6 @@
                                           hostEID, &dbusImplReq, &reqHandler));
 #endif
     invoker.registerHandler(
-        PLDM_BASE, std::make_unique<base::Handler>(hostEID, dbusImplReq, event,
-                                                   &reqHandler));
-    invoker.registerHandler(
         PLDM_BIOS, std::make_unique<bios::Handler>(sockfd, hostEID,
                                                    &dbusImplReq, &reqHandler));
     auto fruHandler = std::make_unique<fru::Handler>(
@@ -246,6 +243,10 @@
 #endif
 
     invoker.registerHandler(PLDM_PLATFORM, std::move(platformHandler));
+    invoker.registerHandler(
+        PLDM_BASE,
+        std::make_unique<base::Handler>(hostEID, dbusImplReq, event,
+                                        oemPlatformHandler.get(), &reqHandler));
     invoker.registerHandler(PLDM_FRU, std::move(fruHandler));
     dbus_api::Pdr dbusImplPdr(bus, "/xyz/openbmc_project/pldm", pdrRepo.get());
     sdbusplus::xyz::openbmc_project::PLDM::server::Event dbusImplEvent(