diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableBuilder.c b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableBuilder.c
index 8fea73e4c3..7162d0ef7b 100644
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableBuilder.c
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/SmbiosTableBuilder.c
@@ -207,16 +207,18 @@ BuildAndInstallMultipleSmbiosTables (
   UINTN              TableCount;
   UINTN              Index;
 
-  TableCount = 0;
-  Status     = Generator->BuildSmbiosTableEx (
-                            Generator,
-                            TableFactoryProtocol,
-                            SmbiosTableInfo,
-                            CfgMgrProtocol,
-                            &SmbiosTable,
-                            &CmObjToken,
-                            &TableCount
-                            );
+  SmbiosTable = NULL;
+  CmObjToken  = NULL;
+  TableCount  = 0;
+  Status      = Generator->BuildSmbiosTableEx (
+                             Generator,
+                             TableFactoryProtocol,
+                             SmbiosTableInfo,
+                             CfgMgrProtocol,
+                             &SmbiosTable,
+                             &CmObjToken,
+                             &TableCount
+                             );
   if (EFI_ERROR (Status)) {
     DEBUG ((
       DEBUG_ERROR,