diff --git a/src/roadstop_base.h b/src/roadstop_base.h
index 5c73d233f0..44e4cd7ddb 100644
--- a/src/roadstop_base.h
+++ b/src/roadstop_base.h
@@ -65,11 +65,9 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
 		void Rebuild(const RoadStop *rs, int side = -1);
 	};
 
-	static const uint LIMIT           = 16;  ///< The maximum amount of roadstops that are allowed at a single station
-
-	TileIndex        xy;                    ///< Position on the map
-	byte             status;                ///< Current status of the Stop, @see RoadStopSatusFlag. Access using *Bay and *Busy functions.
-	struct RoadStop  *next;                 ///< Next stop of the given type at this station
+	TileIndex       xy;     ///< Position on the map
+	byte            status; ///< Current status of the Stop, @see RoadStopSatusFlag. Access using *Bay and *Busy functions.
+	struct RoadStop *next;  ///< Next stop of the given type at this station
 
 	/** Initializes a RoadStop */
 	FORCEINLINE RoadStop(TileIndex tile = INVALID_TILE) :
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 1cc549ce58..f93a72461a 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -71,18 +71,6 @@ bool IsHangar(TileIndex t)
 	return false;
 }
 
-static uint GetNumRoadStopsInStation(const Station *st, RoadStopType type)
-{
-	uint num = 0;
-
-	assert(st != NULL);
-	for (const RoadStop *rs = st->GetPrimaryRoadStop(type); rs != NULL; rs = rs->next) {
-		num++;
-	}
-
-	return num;
-}
-
 /**
  * Look for a station around the given tile area.
  * @param ta the area to search over
@@ -1589,11 +1577,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	/* give us a road stop in the list, and check if something went wrong */
 	if (!RoadStop::CanAllocateItem()) return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
 
-	if (st != NULL &&
-			GetNumRoadStopsInStation(st, ROADSTOP_BUS) + GetNumRoadStopsInStation(st, ROADSTOP_TRUCK) >= RoadStop::LIMIT) {
-		return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
-	}
-
 	if (st != NULL) {
 		if (st->owner != _current_company) {
 			return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION);