diff --git a/src/TSMapEditor/Models/Map.cs b/src/TSMapEditor/Models/Map.cs
index 601b4702..32cf6220 100644
--- a/src/TSMapEditor/Models/Map.cs
+++ b/src/TSMapEditor/Models/Map.cs
@@ -937,6 +937,9 @@ public void MoveWaypoint(Waypoint waypoint, Point2D newCoords)
         /// <returns>True if the object can be moved, otherwise false.</returns>
         public bool CanPlaceObjectAt(IMovable movable, Point2D newCoords, bool blocksSelf, bool overlapObjects)
         {
+            if (movable.WhatAmI() == RTTIType.Waypoint)
+                return true;
+
             if (movable.WhatAmI() == RTTIType.Building)
             {
                 bool canPlace = true;
diff --git a/src/TSMapEditor/Models/MapTile.cs b/src/TSMapEditor/Models/MapTile.cs
index ec9af5fc..6b0ce97c 100644
--- a/src/TSMapEditor/Models/MapTile.cs
+++ b/src/TSMapEditor/Models/MapTile.cs
@@ -225,8 +225,6 @@ public bool CanAddObject(GameObject gameObject, bool blocksSelf, bool overlapObj
                     return GetFreeSubCellSpot() != SubCell.None;
                 case RTTIType.Terrain:
                     return TerrainObject == null;
-                case RTTIType.Waypoint:
-                    return true;
             }
 
             return false;