diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
index befd086..fdc7e3c 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
@@ -110,8 +110,12 @@
   pnormtd="$(findmtd pnor)"
   pnor="${pnormtd#mtd}"
   ubidev="/dev/ubi${pnor}"
+  pnordev="/dev/mtd${pnor}"
 
   if [[ "${name}" == "pnor-patch" ]]; then
+    if [[ ! "$(hexdump -C -n 3 ${pnordev})" =~ "UBI" ]]; then
+      return 0
+    fi
     mountdir="/usr/local/share/pnor"
   else
     mountdir="/media/${name}"