diff --git a/components/com_users/forms/registration.xml b/components/com_users/forms/registration.xml
index 1b549084cde9b..637be5cb95902 100644
--- a/components/com_users/forms/registration.xml
+++ b/components/com_users/forms/registration.xml
@@ -73,7 +73,9 @@
 			validDomains="com_users.domains"
 			autocomplete="email"
 		/>
+	</fieldset>
 
+	<fieldset name="captcha">
 		<field
 			name="captcha"
 			type="captcha"
diff --git a/components/com_users/src/View/Registration/HtmlView.php b/components/com_users/src/View/Registration/HtmlView.php
index b0f09878b35ef..08840947af8bf 100644
--- a/components/com_users/src/View/Registration/HtmlView.php
+++ b/components/com_users/src/View/Registration/HtmlView.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -63,6 +64,15 @@ class HtmlView extends BaseHtmlView
      */
     public $document;
 
+    /**
+     * Should we show a captcha form for the submission of the article?
+     *
+     * @var    boolean
+     *
+     * @since  3.7.0
+     */
+    protected $captchaEnabled = false;
+
     /**
      * The page class suffix
      *
@@ -101,6 +111,15 @@ public function display($tpl = null)
             $this->setLayout($active->query['layout']);
         }
 
+        $captchaSet = $this->params->get('captcha', Factory::getApplication()->get('captcha', '0'));
+
+        foreach (PluginHelper::getPlugin('captcha') as $plugin) {
+            if ($captchaSet === $plugin->name) {
+                $this->captchaEnabled = true;
+                break;
+            }
+        }
+
         // Escape strings for HTML output
         $this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx', ''), ENT_COMPAT, 'UTF-8');
 
diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index 79fcbd67faa4f..17771b44026c1 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -28,6 +28,9 @@
     <form id="member-registration" action="<?php echo Route::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+            <?php if ($fieldset->name === 'captcha' && $this->captchaEnabled) : ?>
+                <?php continue; ?>
+            <?php endif; ?>
             <?php $fields = $this->form->getFieldset($fieldset->name); ?>
             <?php if (count($fields)) : ?>
                 <fieldset>
@@ -39,6 +42,9 @@
                 </fieldset>
             <?php endif; ?>
         <?php endforeach; ?>
+        <?php if ($this->captchaEnabled) : ?>
+            <?php echo $this->form->renderFieldset('captcha'); ?>
+        <?php endif; ?>
         <div class="com-users-registration__submit control-group">
             <div class="controls">
                 <button type="submit" class="com-users-registration__register btn btn-primary validate">