diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index 866eb53..e7ba650 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -1754,6 +1754,16 @@
             }
         }
 
+        // Enable all mux which are used for connecting to the i2c on the pcie
+        // slots for pcie cards. These are not enabled by kernel due to an issue
+        // seen with Castello cards, where the i2c line hangs on a probe.
+        // To run it only once have kept it under System vpd check.
+        // we need to run this on all BMC reboots so kept here
+        if (file == systemVpdFilePath)
+        {
+            doEnableAllMuxChips(js);
+        }
+
         if (file.empty())
         {
             std::cerr << "The EEPROM path <" << file << "> is not valid.";
@@ -1807,15 +1817,6 @@
             return 0;
         }
 
-        // Enable all mux which are used for connecting to the i2c on the pcie
-        // slots for pcie cards. These are not enabled by kernel due to an issue
-        // seen with Castello cards, where the i2c line hangs on a probe.
-        // To run it only once have kept it under System vpd check.
-        if (isSystemVpd)
-        {
-            doEnableAllMuxChips(js);
-        }
-
         try
         {
             variant<KeywordVpdMap, Store> parseResult;