diff --git a/lisp/org-table.el b/lisp/org-table.el
index 75a6a87f6..4015aa694 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2290,7 +2290,8 @@ For all numbers larger than LIMIT, shift them by DELTA."
   (save-excursion
     (goto-char (org-table-end))
     (let ((case-fold-search t)
-	  (s-end (save-excursion (re-search-forward "^\\S-*$\\|\\'" nil t))))
+	  (s-end (min (save-excursion (re-search-forward "^\\S-*$\\|\\'" nil t))
+		      (save-excursion (org-end-of-subtree t)))))
       (while (re-search-forward "[ \t]*#\\+tblfm:" s-end t)
 	(let ((msg "The formulas in #+TBLFM have been updated")
 	      (re (concat key "\\([0-9]+\\)"))