diff --git a/src/apps/haiku-depot/textview/ParagraphLayout.cpp b/src/apps/haiku-depot/textview/ParagraphLayout.cpp
index 86f30c2599..eebc22fa01 100644
--- a/src/apps/haiku-depot/textview/ParagraphLayout.cpp
+++ b/src/apps/haiku-depot/textview/ParagraphLayout.cpp
@@ -942,12 +942,6 @@ ParagraphLayout::_DrawSpan(BView* view, BPoint offset,
 	delta.nonspace = line.extraGlyphSpacing;
 	delta.space = line.extraWhiteSpacing;
 
-	// TODO: Fix in app_server: First glyph should not be shifted by delta.
-	if (text[0] == ' ')
-		offset.x -= delta.space;
-	else
-		offset.x -= delta.nonspace;
-
 	view->DrawString(span.Text(), offset, &delta);
 }