diff --git a/classes/models/fields/FrmFieldCaptcha.php b/classes/models/fields/FrmFieldCaptcha.php
index f0f696553b..2ac8cdb71c 100644
--- a/classes/models/fields/FrmFieldCaptcha.php
+++ b/classes/models/fields/FrmFieldCaptcha.php
@@ -72,7 +72,11 @@ protected function extra_field_opts() {
 	}
 
 	/**
-	 * Replace the "for" attribute for captcha field so it matches the response ID.
+	 * Modify the captcha field label so it is not orphaned.
+	 *
+	 * The label is omitted when the label position is set to "none".
+	 * When the label is visible it is rendered as a <span> instead of a <label>,
+	 * since the captcha response input is inside an iframe and cannot be referenced.
 	 *
 	 * @param array  $args
 	 * @param string $html
@@ -80,8 +84,17 @@ protected function extra_field_opts() {
 	 * @return string
 	 */
 	protected function before_replace_html_shortcodes( $args, $html ) {
-		$settings = FrmCaptchaFactory::get_settings_object();
-		return str_replace( ' for="field_[key]"', ' for="' . esc_attr( $settings->token_field ) . '"', $html );
+		if ( 'none' === FrmField::get_option( $this->field, 'label' ) ) {
+			// Fully strip the label for a CAPTCHA if it is set to hidden.
+			return preg_replace( '~\s*<label\b[^>]*for="field_\[key\]"[^>]*>.*?</label>\s*~s', '', $html );
+		}
+
+		// Convert a CAPTCHA label to a span to prevent an orphaned label issue in WAVE.
+		return preg_replace(
+			'~<label\b([^>]*?)\s*for="field_\[key\]"([^>]*?)>(.*?)</label>~s',
+			'<span$1$2>$3</span>',
+			$html
+		);
 	}
 
 	/**