diff --git a/src/BeforeClip.tsx b/src/BeforeClip.tsx
index 0d8407e..8ae4e20 100644
--- a/src/BeforeClip.tsx
+++ b/src/BeforeClip.tsx
@@ -10,33 +10,29 @@ interface BeforeClipProps {
   source: ImageSource | number;
   contentFit?: ImageProps["contentFit"];
   imageProps?: PassThroughImageProps;
-  measuredWidth: number;
+  layoutContainerWidth: number;
   splitPx: DerivedValue<number>;
   beforeLabel?: string;
 }
 
 export function BeforeClip(props: BeforeClipProps) {
-  const { measuredWidth, splitPx, source, contentFit, imageProps, beforeLabel } = props;
+  const { layoutContainerWidth, splitPx, source, contentFit, imageProps, beforeLabel } = props;
 
   const clipStyle = useAnimatedStyle(() => ({ width: splitPx.get() }));
 
   return (
     <Animated.View style={[styles.clip, clipStyle]}>
-      {measuredWidth > 0 && (
-        <>
-          <Image
-            {...imageProps}
-            accessible={false}
-            source={source}
-            contentFit={contentFit}
-            style={[styles.leftImage, { width: measuredWidth }]}
-          />
-          {beforeLabel && (
-            <View style={{ width: measuredWidth }}>
-              <Label text={beforeLabel} alignSelf="flex-start" testID="before-label" />
-            </View>
-          )}
-        </>
+      <Image
+        {...imageProps}
+        accessible={false}
+        source={source}
+        contentFit={contentFit}
+        style={[styles.leftImage, { width: layoutContainerWidth }]}
+      />
+      {beforeLabel && (
+        <View style={{ width: layoutContainerWidth }}>
+          <Label text={beforeLabel} alignSelf="flex-start" testID="before-label" />
+        </View>
       )}
     </Animated.View>
   );
diff --git a/src/ImageComparisonSlider.tsx b/src/ImageComparisonSlider.tsx
index 30d9ccf..445bcc0 100644
--- a/src/ImageComparisonSlider.tsx
+++ b/src/ImageComparisonSlider.tsx
@@ -74,8 +74,8 @@ export function ImageComparisonSlider({
   afterLabel,
 }: ImageComparisonSliderProps) {
   const {
-    measuredWidth,
-    containerWidth,
+    layoutContainerWidth,
+    sharedContainerWidth,
     splitPercent,
     splitRatio,
     pan,
@@ -83,7 +83,7 @@ export function ImageComparisonSlider({
     onAccessibilityAction,
   } = useComparisonSlider(initialPosition, enabled);
 
-  const splitPx = useDerivedValue(() => splitRatio.get() * containerWidth.get());
+  const splitPx = useDerivedValue(() => splitRatio.get() * sharedContainerWidth.get());
 
   return (
     <GestureDetector gesture={pan}>
@@ -107,13 +107,13 @@ export function ImageComparisonSlider({
             style={styles.fullImage}
           />
           {afterLabel && enabled && <Label text={afterLabel} testID="after-label" />}
-          {enabled && (
+          {enabled && layoutContainerWidth > 0 && (
             <BeforeClip
               source={before}
               contentFit={contentFit}
               imageProps={beforeImageProps}
               splitPx={splitPx}
-              measuredWidth={measuredWidth}
+              layoutContainerWidth={layoutContainerWidth}
               beforeLabel={beforeLabel}
             />
           )}
diff --git a/src/createSliderPan.ts b/src/createSliderPan.ts
index 1d3cf7c..f74d724 100644
--- a/src/createSliderPan.ts
+++ b/src/createSliderPan.ts
@@ -7,7 +7,7 @@ const PAN_ACTIVE_OFFSET_X = [-0, 0] as [activeOffsetXStart: number, activeOffset
 const PAN_FAIL_OFFSET_Y = [-18, 18] as [failOffsetYStart: number, failOffsetYEnd: number];
 
 export function createSliderPan(
-  containerWidth: SharedValue<number>,
+  sharedContainerWidth: SharedValue<number>,
   splitRatio: SharedValue<number>,
   enabled: boolean,
 ) {
@@ -16,7 +16,7 @@ export function createSliderPan(
     .activeOffsetX(PAN_ACTIVE_OFFSET_X)
     .failOffsetY(PAN_FAIL_OFFSET_Y)
     .onUpdate((e) => {
-      const width = containerWidth.get();
+      const width = sharedContainerWidth.get();
       if (width <= 0) return;
 
       const nextRatio = clampNextRatio(e.x, width, EDGE_MARGIN);
diff --git a/src/useComparisonSlider.ts b/src/useComparisonSlider.ts
index 393f0ad..4b7c79a 100644
--- a/src/useComparisonSlider.ts
+++ b/src/useComparisonSlider.ts
@@ -6,8 +6,8 @@ import { createSliderPan } from "./createSliderPan";
 import { clampInitialRatio, clampNextRatio, EDGE_MARGIN, ratioToPercent } from "./utils";
 
 export function useComparisonSlider(initialPosition: number, enabled: boolean) {
-  const [measuredWidth, setMeasuredWidth] = useState(0);
-  const containerWidth = useSharedValue(0);
+  const [layoutContainerWidth, setLayoutContainerWidth] = useState(0);
+  const sharedContainerWidth = useSharedValue(0);
 
   const initialRatio = clampInitialRatio(initialPosition);
   const initialPercent = ratioToPercent(initialRatio);
@@ -18,10 +18,10 @@ export function useComparisonSlider(initialPosition: number, enabled: boolean) {
     (width: number) => {
       if (width <= 0) return;
 
-      containerWidth.set(width);
-      setMeasuredWidth(width);
+      sharedContainerWidth.set(width);
+      setLayoutContainerWidth(width);
     },
-    [containerWidth],
+    [sharedContainerWidth],
   );
 
   const onAccessibilityAction = useCallback(
@@ -32,22 +32,22 @@ export function useComparisonSlider(initialPosition: number, enabled: boolean) {
       if (actionName !== "increment" && actionName !== "decrement") return;
 
       const nextRatio = clampNextRatio(
-        (splitRatio.get() + (actionName === "increment" ? 0.05 : -0.05)) * measuredWidth,
-        measuredWidth,
+        (splitRatio.get() + (actionName === "increment" ? 0.05 : -0.05)) * layoutContainerWidth,
+        layoutContainerWidth,
         EDGE_MARGIN,
       );
 
       splitRatio.set(nextRatio);
       setSplitPercent(ratioToPercent(nextRatio));
     },
-    [enabled, measuredWidth, splitRatio],
+    [enabled, layoutContainerWidth, splitRatio],
   );
 
-  const pan = createSliderPan(containerWidth, splitRatio, enabled);
+  const pan = createSliderPan(sharedContainerWidth, splitRatio, enabled);
 
   return {
-    measuredWidth,
-    containerWidth,
+    layoutContainerWidth,
+    sharedContainerWidth,
     splitPercent,
     splitRatio,
     pan,