diff --git a/oem/ibm/libpldmresponder/file_table.cpp b/oem/ibm/libpldmresponder/file_table.cpp
index 402934b..9ea1286 100644
--- a/oem/ibm/libpldmresponder/file_table.cpp
+++ b/oem/ibm/libpldmresponder/file_table.cpp
@@ -129,14 +129,21 @@
     return table;
 }
 
+/** Single instance of filetable*/
+static FileTable fileTable;
+
 FileTable& buildFileTable(const std::string& fileTablePath)
 {
-    static FileTable table;
-    if (table.isEmpty())
+    if (fileTable.isEmpty())
     {
-        table = FileTable(fileTablePath);
+        fileTable = FileTable(fileTablePath);
     }
-    return table;
+    return fileTable;
+}
+
+void clearFileTable()
+{
+    fileTable.clear();
 }
 
 } // namespace filetable