diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 5c4767cf..a25ef0d7 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -268,7 +268,10 @@ namespace MapControl
                     SetVisible(element, !IsOutsideViewport(position));
                 }
 
-                ArrangeElement(element, position.Value);
+                if (position.HasValue)
+                {
+                    ArrangeElement(element, position.Value);
+                }
             }
             else
             {