diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 98e63ccfa..1c17a0c6a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,7 +4,8 @@ Changelog
 2.5 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
-* Fix: Set `SERVER_PORT` to 443 in `Page.dummy_request()` for HTTPS sites (Sergey Fedoseev)
+ * Fix: Set `SERVER_PORT` to 443 in `Page.dummy_request()` for HTTPS sites (Sergey Fedoseev)
+ * Fix: Validation error messages in `InlinePanel` no longer count towards `max_num` when disabling the 'add' button (Todd Dembrey, Thibaud Colas)
 
 
 2.4 (xx.xx.xxxx) - IN DEVELOPMENT
diff --git a/docs/releases/2.5.rst b/docs/releases/2.5.rst
index 3e12b8f04..9363d129f 100644
--- a/docs/releases/2.5.rst
+++ b/docs/releases/2.5.rst
@@ -19,6 +19,7 @@ Bug fixes
 ~~~~~~~~~
 
  * Set ``SERVER_PORT`` to 443 in ``Page.dummy_request()`` for HTTPS sites (Sergey Fedoseev)
+ * Validation error messages in ``InlinePanel`` no longer count towards ``max_num`` when disabling the 'add' button (Todd Dembrey, Thibaud Colas)
 
 
 Upgrade considerations
diff --git a/wagtail/admin/static_src/wagtailadmin/js/page-editor.js b/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
index 824ce6f4f..7eb6ca74b 100644
--- a/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
+++ b/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
@@ -176,7 +176,7 @@ function InlinePanel(opts) {
 
     self.updateAddButtonState = function() {
         if (opts.maxForms) {
-            var forms = $('> li', self.formsUl).not('.deleted');
+            var forms = $('> [data-inline-panel-child]', self.formsUl).not('.deleted');
             var addButton = $('#' + opts.formsetPrefix + '-ADD');
 
             if (forms.length >= opts.maxForms) {
diff --git a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
index ee91c8c32..28b0bea34 100644
--- a/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
+++ b/wagtail/admin/templates/wagtailadmin/edit_handlers/inline_panel_child.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<li id="inline_child_{{ child.form.prefix }}">
+<li data-inline-panel-child id="inline_child_{{ child.form.prefix }}">
     <ul class="controls">
         {% if can_order %}
             <li><button type="button" class="button icon text-replace white icon-order-up inline-child-move-up" id="{{ child.form.prefix }}-move-up" title="{% trans 'Move up' %}">{% trans "Move up" %}</button></li>