diff --git a/integration/compose/src/main/java/com/bumptech/glide/integration/compose/GlideModifier.kt b/integration/compose/src/main/java/com/bumptech/glide/integration/compose/GlideModifier.kt
index 5e5815333d..f497fd0fe8 100644
--- a/integration/compose/src/main/java/com/bumptech/glide/integration/compose/GlideModifier.kt
+++ b/integration/compose/src/main/java/com/bumptech/glide/integration/compose/GlideModifier.kt
@@ -579,8 +579,12 @@ internal class GlideNode : DrawModifierNode, LayoutModifierNode, SemanticsModifi
     }
     val scaledSize = srcSize * scaleFactor
 
-    val minWidth = constraints.constrainWidth(scaledSize.width.roundToInt())
-    val minHeight = constraints.constrainHeight(scaledSize.height.roundToInt())
+    val minWidth = constraints.constrainWidth(
+      if (scaledSize.width.isFinite()) scaledSize.width.roundToInt() else constraints.minWidth
+    )
+    val minHeight = constraints.constrainHeight(
+      if (scaledSize.height.isFinite()) scaledSize.height.roundToInt() else constraints.minHeight
+    )
     return constraints.copy(minWidth = minWidth, minHeight = minHeight)
   }