diff --git a/EndlessClient/Rendering/MapEntityRenderers/RoofLayerRenderer.cs b/EndlessClient/Rendering/MapEntityRenderers/RoofLayerRenderer.cs
index 03c6718b..603cf8e0 100644
--- a/EndlessClient/Rendering/MapEntityRenderers/RoofLayerRenderer.cs
+++ b/EndlessClient/Rendering/MapEntityRenderers/RoofLayerRenderer.cs
@@ -44,14 +44,15 @@ public override void RenderElementAt(SpriteBatch spriteBatch, int row, int col,
         {
             var gfxCandidates = new List<int>();
             if (CurrentMap.GFX[MapLayer.Roof][row - 1, col] > 0)
+            {
                 gfxCandidates.Add(CurrentMap.GFX[MapLayer.Roof][row - 1, col]);
-            if (row == CurrentMap.Properties.Height)
+            }
+
+            if (row == CurrentMap.Properties.Height && CurrentMap.GFX[MapLayer.Roof][row, col] > 0)
             {
-                if (CurrentMap.GFX[MapLayer.Roof][row, col] > 0)
-                    gfxCandidates.Add(CurrentMap.GFX[MapLayer.Roof][row, col]);
+                gfxCandidates.Add(CurrentMap.GFX[MapLayer.Roof][row, col]);
             }
 
-            //int gfxNum = CurrentMap.GFX[MapLayer.Roof][row-1, col];
             foreach (var gfxNum in gfxCandidates)
             {
                 var gfx = _nativeGraphicsManager.TextureFromResource(GFXTypes.MapWallTop, gfxNum, true);