diff --git a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/PciEmulation.c b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/PciEmulation.c
index e908953c0e..9fdb09b2fb 100644
--- a/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/PciEmulation.c
+++ b/ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/PciEmulation.c
@@ -547,8 +547,8 @@ PciInstallDevice (
   //
   // Configure PCI config space: OHCI + EHCI
   //
-  Private->ConfigSpace->Hdr.VendorId = 0x3530; //TODO: Define one
-  Private->ConfigSpace->Hdr.DeviceId = 0x3530; //TODO: Define one
+  Private->ConfigSpace->Hdr.VendorId = 0xFFFF; // Invalid vendor Id as it is not an actual device.
+  Private->ConfigSpace->Hdr.DeviceId = 0x0000; // Not relevant as the vendor id is not valid.
   Private->ConfigSpace->Hdr.ClassCode[0] = ClassCode1;
   Private->ConfigSpace->Hdr.ClassCode[1] = ClassCode2;
   Private->ConfigSpace->Hdr.ClassCode[2] = ClassCode3;
diff --git a/Omap35xxPkg/PciEmulation/PciEmulation.c b/Omap35xxPkg/PciEmulation/PciEmulation.c
index 111652366b..17ea03ccf4 100644
--- a/Omap35xxPkg/PciEmulation/PciEmulation.c
+++ b/Omap35xxPkg/PciEmulation/PciEmulation.c
@@ -604,8 +604,8 @@ PciEmulationEntryPoint (
   }
 
   // Configure PCI config space
-  Private->ConfigSpace->Hdr.VendorId = 0x3530;
-  Private->ConfigSpace->Hdr.DeviceId = 0x3530;
+  Private->ConfigSpace->Hdr.VendorId = 0xFFFF; // Invalid vendor Id as it is not an actual device.
+  Private->ConfigSpace->Hdr.DeviceId = 0x0000; // Not relevant as the vendor id is not valid.
   Private->ConfigSpace->Hdr.ClassCode[0] = 0x20;
   Private->ConfigSpace->Hdr.ClassCode[1] = 0x03;
   Private->ConfigSpace->Hdr.ClassCode[2] = 0x0C;