diff --git a/src/components/PopoverWithoutOverlay/index.js b/src/components/PopoverWithoutOverlay/index.js
index d35637958f1d..3b194ad4b9cf 100644
--- a/src/components/PopoverWithoutOverlay/index.js
+++ b/src/components/PopoverWithoutOverlay/index.js
@@ -8,7 +8,6 @@ import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import getModalStyles from '../../styles/getModalStyles';
 import withWindowDimensions from '../withWindowDimensions';
-import usePrevious from '../../hooks/usePrevious';
 
 function Popover(props) {
     const {onOpen, close} = React.useContext(PopoverContext);
@@ -25,8 +24,6 @@ function Popover(props) {
         props.outerStyle,
     );
 
-    const prevIsVisible = usePrevious(props.isVisible);
-
     React.useEffect(() => {
         if (props.isVisible) {
             props.onModalShow();
@@ -43,7 +40,7 @@ function Popover(props) {
         Modal.willAlertModalBecomeVisible(props.isVisible);
 
         // We prevent setting closeModal function to null when the component is invisible the first time it is rendered
-        if (prevIsVisible === props.isVisible && (!firstRenderRef.current || !props.isVisible)) {
+        if (!firstRenderRef.current || !props.isVisible) {
             firstRenderRef.current = false;
             return;
         }
@@ -52,7 +49,7 @@ function Popover(props) {
 
         // We want this effect to run strictly ONLY when isVisible prop changes
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.isVisible, prevIsVisible]);
+    }, [props.isVisible]);
 
     if (!props.isVisible) {
         return null;