diff --git a/src/Popover.tsx b/src/Popover.tsx
index 8de8b5aae4..f8e5f4eac3 100644
--- a/src/Popover.tsx
+++ b/src/Popover.tsx
@@ -101,7 +101,7 @@ const Popover = React.forwardRef<HTMLDivElement, PopoverProps>(
       arrowProps,
       hasDoneInitialMeasure,
       popper,
-      show: _,
+      show,
       ...props
     },
     ref,
@@ -112,7 +112,7 @@ const Popover = React.forwardRef<HTMLDivElement, PopoverProps>(
     const bsDirection = getOverlayDirection(primaryPlacement, isRTL);
 
     let computedStyle = style;
-    if (!hasDoneInitialMeasure) {
+    if (show && !hasDoneInitialMeasure) {
       computedStyle = {
         ...style,
         ...getInitialPopperStyles(popper?.strategy),
diff --git a/src/Tooltip.tsx b/src/Tooltip.tsx
index f0ce28d51e..86ac3fe098 100644
--- a/src/Tooltip.tsx
+++ b/src/Tooltip.tsx
@@ -92,7 +92,7 @@ const Tooltip = React.forwardRef<HTMLDivElement, TooltipProps>(
       arrowProps,
       hasDoneInitialMeasure,
       popper,
-      show: _,
+      show,
       ...props
     }: TooltipProps,
     ref,
@@ -104,7 +104,7 @@ const Tooltip = React.forwardRef<HTMLDivElement, TooltipProps>(
     const bsDirection = getOverlayDirection(primaryPlacement, isRTL);
 
     let computedStyle = style;
-    if (!hasDoneInitialMeasure) {
+    if (show && !hasDoneInitialMeasure) {
       computedStyle = {
         ...style,
         ...getInitialPopperStyles(popper?.strategy),