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 19878d4..0cdf74e 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
@@ -28,6 +28,11 @@
   pnor="${pnormtd#mtd}"
   pnordev="/dev/mtd${pnor}"
 
+  if [ -d "/sys/class/ubi/ubi${pnor}" ]; then
+    # Already attached
+    return 0
+  fi
+
   ubiattach /dev/ubi_ctrl -m "${pnor}" -d "${pnor}"
   rc=$?
   if [ ${rc} -ne 0 ]; then