diff --git a/packages/rrweb-snapshot/src/snapshot.ts b/packages/rrweb-snapshot/src/snapshot.ts
index cc1eca0d3b..f14ce4b62e 100644
--- a/packages/rrweb-snapshot/src/snapshot.ts
+++ b/packages/rrweb-snapshot/src/snapshot.ts
@@ -26,6 +26,7 @@ import {
   toLowerCase,
   toUpperCase,
   validateStringifiedCssRule,
+  shouldMaskInput,
 } from './utils';
 
 let _id = 1;
@@ -701,19 +702,16 @@ function serializeTextNode(
   if (isScript) {
     textContent = 'SCRIPT_PLACEHOLDER';
   }
-  if (
-    !isStyle &&
-    !isScript &&
-    textContent &&
-    needMaskingText(
-      n,
-      maskTextClass,
-      maskTextSelector,
-      unmaskTextClass,
-      unmaskTextSelector,
-      maskAllText,
-    )
-  ) {
+  const forceMask = needMaskingText(
+    n,
+    maskTextClass,
+    maskTextSelector,
+    unmaskTextClass,
+    unmaskTextSelector,
+    maskAllText,
+  );
+
+  if (!isStyle && !isScript && textContent && forceMask) {
     textContent = maskTextFn
       ? maskTextFn(textContent)
       : textContent.replace(/[\S]/g, '*');
@@ -726,12 +724,23 @@ function serializeTextNode(
 
   // Handle <option> text like an input value
   if (parentTagName === 'OPTION' && textContent) {
-    textContent = maskInputValue({
-      element: n as unknown as HTMLElement,
+    const isInputMasked = shouldMaskInput({
       type: null,
       tagName: parentTagName,
-      value: textContent,
       maskInputOptions,
+    });
+
+    textContent = maskInputValue({
+      isMasked: needMaskingText(
+        n,
+        maskTextClass,
+        maskTextSelector,
+        unmaskTextClass,
+        unmaskTextSelector,
+        isInputMasked,
+      ),
+      element: n as unknown as HTMLElement,
+      value: textContent,
       maskInputFn,
     });
   }
@@ -852,11 +861,7 @@ function serializeElementNode(
     const type = getInputType(el);
     const value = getInputValue(el, toUpperCase(tagName), type);
     const checked = (n as HTMLInputElement).checked;
-    if (
-      attributes.type !== 'submit' &&
-      attributes.type !== 'button' &&
-      value
-    ) {
+    if (attributes.type !== 'submit' && attributes.type !== 'button' && value) {
       const type = getInputType(n);
       const forceMask = needMaskingText(
         n,
@@ -864,17 +869,18 @@ function serializeElementNode(
         maskTextSelector,
         unmaskTextClass,
         unmaskTextSelector,
-        maskAllText,
+        shouldMaskInput({
+          type,
+          tagName: toUpperCase(tagName),
+          maskInputOptions,
+        })
       );
 
       attributes.value = maskInputValue({
+        isMasked: forceMask,
         element: el,
-        type,
-        tagName: toUpperCase(tagName),
         value,
-        maskInputOptions,
         maskInputFn,
-        forceMask,
       });
     }
     if (checked) {
diff --git a/packages/rrweb-snapshot/src/utils.ts b/packages/rrweb-snapshot/src/utils.ts
index a21bb3305b..43bcacdccb 100644
--- a/packages/rrweb-snapshot/src/utils.ts
+++ b/packages/rrweb-snapshot/src/utils.ts
@@ -164,43 +164,48 @@ export function createMirror(): Mirror {
   return new Mirror();
 }
 
-export function maskInputValue({
-  element,
+export function shouldMaskInput({
   maskInputOptions,
   tagName,
   type,
-  value,
-  maskInputFn,
-  forceMask,
 }: {
-  element: HTMLElement;
   maskInputOptions: MaskInputOptions;
   tagName: Uppercase<string>;
   type: Lowercase<string> | null;
+}): boolean {
+  // Handle `option` like `select
+  if (tagName === 'OPTION') {
+    tagName = 'SELECT';
+  }
+  const actualType = type && toLowerCase(type);
+  return Boolean(
+    maskInputOptions[tagName.toLowerCase() as keyof MaskInputOptions] ||
+    (actualType && maskInputOptions[actualType as keyof MaskInputOptions])
+  );
+}
+
+export function maskInputValue({
+  isMasked,
+  element,
+  value,
+  maskInputFn,
+}: {
+  isMasked: boolean;
+  element: HTMLElement;
   value: string | null;
   maskInputFn?: MaskInputFn;
-  forceMask?: boolean;
 }): string {
   let text = value || '';
-  const actualType = type && toLowerCase(type);
 
-  // Handle `option` like `select
-  if (tagName === 'OPTION') {
-    tagName = 'SELECT';
+  if (!isMasked) {
+    return text;
   }
 
-  if (
-    maskInputOptions[tagName.toLowerCase() as keyof MaskInputOptions] ||
-    (actualType && maskInputOptions[actualType as keyof MaskInputOptions]) ||
-    forceMask
-  ) {
-    if (maskInputFn) {
-      text = maskInputFn(text, element);
-    } else {
-      text = '*'.repeat(text.length);
-    }
+  if (maskInputFn) {
+    text = maskInputFn(text, element);
   }
-  return text;
+
+  return '*'.repeat(text.length);
 }
 
 export function toLowerCase<T extends string>(str: T): Lowercase<T> {
diff --git a/packages/rrweb/src/record/mutation.ts b/packages/rrweb/src/record/mutation.ts
index 701425c0d8..1851b1485d 100644
--- a/packages/rrweb/src/record/mutation.ts
+++ b/packages/rrweb/src/record/mutation.ts
@@ -11,6 +11,7 @@ import {
   getInputType,
   toLowerCase,
   getInputValue,
+  shouldMaskInput,
 } from '@sentry-internal/rrweb-snapshot';
 import type { observerParam, MutationBufferParam } from '../types';
 import type {
@@ -531,23 +532,26 @@ export default class MutationBuffer {
           const tagName = target.tagName as unknown as Uppercase<string>;
           value = getInputValue(target as HTMLInputElement, tagName, type);
 
+          const isInputMasked = shouldMaskInput({
+            maskInputOptions: this.maskInputOptions,
+            tagName,
+            type,
+          })
+
           const forceMask = needMaskingText(
             m.target,
             this.maskTextClass,
             this.maskTextSelector,
             this.unmaskTextClass,
             this.unmaskTextSelector,
-            this.maskAllText,
+            isInputMasked,
           );
 
           value = maskInputValue({
+            isMasked: forceMask,
             element: target,
-            maskInputOptions: this.maskInputOptions,
-            tagName,
-            type,
             value,
             maskInputFn: this.maskInputFn,
-            forceMask,
           });
         }
         if (
diff --git a/packages/rrweb/src/record/observer.ts b/packages/rrweb/src/record/observer.ts
index 2675480e0e..4b7ea41579 100644
--- a/packages/rrweb/src/record/observer.ts
+++ b/packages/rrweb/src/record/observer.ts
@@ -1,9 +1,9 @@
 import {
-  MaskInputOptions,
   maskInputValue,
   Mirror,
   getInputType,
   getInputValue,
+  shouldMaskInput,
   toLowerCase,
   needMaskingText,
   toUpperCase,
@@ -126,7 +126,7 @@ export function initMutationObserver(
       // If this callback returns `false`, we do not want to process the mutations
       // This can be used to e.g. do a manual full snapshot when mutations become too large, or similar.
       if (options.onMutation && options.onMutation(mutations) === false) {
-         return;
+        return;
       }
       mutationBuffer.processMutations.bind(mutationBuffer)(mutations);
     }),
@@ -438,7 +438,6 @@ function initInputObserver({
   maskInputFn,
   sampling,
   userTriggeredOnInput,
-  maskAllText,
   maskTextClass,
   unmaskTextClass,
   maskTextSelector,
@@ -475,33 +474,32 @@ function initInputObserver({
     let text = getInputValue(el, tagName, type);
     let isChecked = false;
 
+    const isInputMasked = shouldMaskInput({
+      maskInputOptions,
+      tagName,
+      type,
+    });
+
     const forceMask = needMaskingText(
       target as Node,
       maskTextClass,
       maskTextSelector,
       unmaskTextClass,
       unmaskTextSelector,
-      maskAllText,
+      isInputMasked,
     );
 
     if (type === 'radio' || type === 'checkbox') {
       isChecked = (target as HTMLInputElement).checked;
     }
-    if (
-      maskInputOptions[tagName.toLowerCase() as keyof MaskInputOptions] ||
-      (type && maskInputOptions[type as keyof MaskInputOptions]) ||
-      forceMask
-    ) {
-      text = maskInputValue({
-        element: target,
-        maskInputOptions,
-        tagName,
-        type,
-        value: text,
-        maskInputFn,
-        forceMask,
-      });
-    }
+
+    text = maskInputValue({
+      isMasked: forceMask,
+      element: target,
+      value: text,
+      maskInputFn,
+    });
+
     cbWithDedup(
       target,
       callbackWrapper(wrapEventWithUserTriggeredFlag)(
@@ -518,10 +516,9 @@ function initInputObserver({
         .forEach((el) => {
           if (el !== target) {
             const text = maskInputValue({
+              // share mask behavior of `target`
+              isMasked: forceMask,
               element: el as HTMLInputElement,
-              maskInputOptions,
-              tagName,
-              type,
               value: getInputValue(el as HTMLInputElement, tagName, type),
               maskInputFn,
             });