diff --git a/src/servers/app/Layer.cpp b/src/servers/app/Layer.cpp
index ed291b719d..567c582be1 100644
--- a/src/servers/app/Layer.cpp
+++ b/src/servers/app/Layer.cpp
@@ -1217,14 +1217,7 @@ Layer::BoundsOrigin() const
 float
 Layer::Scale() const
 {
-	float scale = 1.0f;
-
-	DrawState* layerData = fDrawState;
-	do {
-		scale *= layerData->Scale();
-	} while ((layerData = layerData->PreviousState()) != NULL);
-
-	return scale;
+	return CurrentState()->Scale();
 }