diff --git a/native/markdown/markdown-spoiler.react.js b/native/markdown/markdown-spoiler.react.js
index ec096983d..05d9f3b58 100644
--- a/native/markdown/markdown-spoiler.react.js
+++ b/native/markdown/markdown-spoiler.react.js
@@ -1,88 +1,90 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import { Text } from 'react-native';
 
 import type { ReactElement } from 'lib/shared/markdown';
 
 import { TextMessageMarkdownContext } from '../chat/text-message-markdown-context';
 import { useStyles } from '../themes/colors';
 import { MarkdownContext } from './markdown-context';
 
 type MarkdownSpoilerProps = {
   +spoilerIdentifier: string | number | void,
   +text: ReactElement,
   +children?: React.Node,
 };
 
 function MarkdownSpoiler(props: MarkdownSpoilerProps): React.Node {
   const markdownContext = React.useContext(MarkdownContext);
   invariant(markdownContext, 'MarkdownContext should be set');
 
   const textMessageMarkdownContext = React.useContext(
     TextMessageMarkdownContext,
   );
 
   const styles = useStyles(unboundStyles);
 
   const { text, spoilerIdentifier } = props;
   const { spoilerRevealed, setSpoilerRevealed } = markdownContext;
   const messageKey = textMessageMarkdownContext?.messageKey;
 
   const parsedSpoilerIdentifier = spoilerIdentifier
     ? parseInt(spoilerIdentifier)
-    : -1;
+    : null;
 
   const isRevealed =
-    (messageKey && spoilerRevealed[messageKey]?.[parsedSpoilerIdentifier]) ??
+    (messageKey &&
+      parsedSpoilerIdentifier !== null &&
+      spoilerRevealed[messageKey]?.[parsedSpoilerIdentifier]) ??
     false;
 
   const styleBasedOnSpoilerState = React.useMemo(() => {
     if (isRevealed) {
       return null;
     }
     return styles.spoilerHidden;
   }, [isRevealed, styles.spoilerHidden]);
 
   const onSpoilerClick = React.useCallback(() => {
     if (isRevealed) {
       return;
     }
 
-    if (messageKey && parsedSpoilerIdentifier !== -1) {
+    if (messageKey && parsedSpoilerIdentifier !== null) {
       setSpoilerRevealed({
         ...spoilerRevealed,
         [messageKey]: {
           ...spoilerRevealed[messageKey],
           [parsedSpoilerIdentifier]: true,
         },
       });
     }
   }, [
     isRevealed,
     spoilerRevealed,
     setSpoilerRevealed,
     messageKey,
     parsedSpoilerIdentifier,
   ]);
 
   const memoizedSpoiler = React.useMemo(() => {
     return (
       <Text onPress={onSpoilerClick} style={styleBasedOnSpoilerState}>
         {text}
       </Text>
     );
   }, [onSpoilerClick, styleBasedOnSpoilerState, text]);
 
   return memoizedSpoiler;
 }
 
 const unboundStyles = {
   spoilerHidden: {
     color: 'spoiler',
     backgroundColor: 'spoiler',
   },
 };
 
 export default MarkdownSpoiler;