diff --git a/ooxml/XWPF/Usermodel/XWPFDocument.cs b/ooxml/XWPF/Usermodel/XWPFDocument.cs
index abda4ba16..9be63d126 100644
--- a/ooxml/XWPF/Usermodel/XWPFDocument.cs
+++ b/ooxml/XWPF/Usermodel/XWPFDocument.cs
@@ -1958,13 +1958,22 @@ public void FindAndReplaceText(string oldValue, string newValue)
                 {
                     FindAndReplaceTextInParagraph(paragraph, oldValue, newValue);
                 }
+                foreach(var table in footer.Tables)
+                {
+                    FindAndReplaceTextInTable(table, oldValue, newValue);
+                }
             }
+
             foreach (var header in this.HeaderList)
             {
                 foreach (var paragraph in header.Paragraphs)
                 {
                     FindAndReplaceTextInParagraph(paragraph, oldValue, newValue);
                 }
+                foreach(var table in header.Tables)
+                {
+                    FindAndReplaceTextInTable(table, oldValue, newValue);
+                }
             }
         }
         public void Dispose()