diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index c816c53f3..4d46f1fdb 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -1552,10 +1552,13 @@ class Form extends ViewableData implements HasRequestHandler
             HTTPCacheControlMiddleware::singleton()->disableCache();
         }
 
-        $return = $this->renderWith($this->getTemplates());
+        $context = $this;
+        $this->extend('onBeforeRender', $context);
+
+        $return = $context->renderWith($this->getTemplates());
 
         // Now that we're rendered, clear message
-        $this->clearMessage();
+        $context->clearMessage();
 
         return $return;
     }