1 files changed, 16 insertions, 7 deletions
diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c
index e2a5e666ce7b..0062216ac307 100644
--- a/lib/libefivar/efivar-dp-format.c
+++ b/lib/libefivar/efivar-dp-format.c
@@ -539,13 +539,22 @@ DevPathToTextAcpiEx (
     //
     // use AcpiExp()
     //
-    UefiDevicePathLibCatPrint (
-      Str,
-      "AcpiExp(%s,%s,%s)",
-      HIDText,
-      CIDText,
-      UIDStr
-      );
+    if (AcpiEx->CID == 0) {
+      UefiDevicePathLibCatPrint (
+         Str,
+         "AcpiExp(%s,0,%s)",
+         HIDText,
+         UIDStr
+        );
+    } else {
+      UefiDevicePathLibCatPrint (
+        Str,
+        "AcpiExp(%s,%s,%s)",
+        HIDText,
+        CIDText,
+        UIDStr
+        );
+    }
   } else {
     if (AllowShortcuts) {
       //