diff --git a/ChangeLog.3 b/ChangeLog.3
index 83e5001e522..8b872a0726e 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -2,6 +2,20 @@
 
 	* Version 27.2 released.
 
+2021-03-18 Basil L. Contovounesios <contovob@tcd.ie>
+
+	Fix 'frame-inner-height' in non-GUI builds
+
+	Include tab bar in frame's inner height in non-GUI builds that
+	don't define 'tab-bar-height'.  This is consistent with the
+	inclusion of the menu bar in the calculated height.  It is also
+	consistent with TTY frames of GUI builds, for which
+	'tab-bar-height' is always zero anyway (bug#47234).
+	Fix suggested by Eli Zaretskii <eliz@gnu.org>.
+
+	* lisp/frame.el (frame-inner-height): Don't assume
+	'tab-bar-height' is defined in builds --without-x.
+
 2021-03-18  Eli Zaretskii  <eliz@gnu.org>
 
 	* etc/HISTORY: Update for Emacs 27.2.
diff --git a/lisp/frame.el b/lisp/frame.el
index b5a8e0ed72a..151aefb47a3 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1370,7 +1370,7 @@ FRAME defaults to the selected frame."
 FRAME defaults to the selected frame."
   (setq frame (window-normalize-frame frame))
   (- (frame-native-height frame)
-     (tab-bar-height frame t)
+     (if (fboundp 'tab-bar-height) (tab-bar-height frame t) 0)
      (* 2 (frame-internal-border-width frame))))
 
 (defun frame-outer-width (&optional frame)