diff --git a/occ_status.cpp b/occ_status.cpp
index 5249fbe..36520b5 100644
--- a/occ_status.cpp
+++ b/occ_status.cpp
@@ -38,6 +38,27 @@
             device.unBind();
         }
     }
+    else if (value && !device.bound())
+    {
+        // Existing error watch is on a dead file descriptor.
+        // TODO: openbmc/openbmc#2285
+        // removeErrorWatch();
+
+        /*
+         * In it's constructor, Status checks Device::bound() to see if OCC is
+         * active or not.
+         * Device::bound() checks for occX-dev0 directory.
+         * We will lose occX-dev0 directories during FSI rescan.
+         * So, if we start this application (and construct Status), and then
+         * later do FSI rescan, we will end up with occActive = true and device
+         * NOT bound. Lets correct that situation here.
+         */
+        device.bind();
+
+        // Add error watch again
+        // TODO: openbmc/openbmc#2285
+        // addErrorWatch();
+    }
     return Base::Status::occActive(value);
 }