diff --git a/src/otclient/core/tile.cpp b/src/otclient/core/tile.cpp
index cec4d8be..29159072 100644
--- a/src/otclient/core/tile.cpp
+++ b/src/otclient/core/tile.cpp
@@ -181,6 +181,9 @@ ThingPtr Tile::addThing(const ThingPtr& thing, int stackPos)
         oldObject = m_things[stackPos];
     m_things.insert(m_things.begin() + stackPos, thing);
 
+    if(m_things.size() > MAX_THINGS)
+        removeThing(m_things[MAX_THINGS]);
+
     return oldObject;
 }
 
diff --git a/src/otclient/core/tile.h b/src/otclient/core/tile.h
index 920ed526..0315a442 100644
--- a/src/otclient/core/tile.h
+++ b/src/otclient/core/tile.h
@@ -29,6 +29,10 @@
 class Tile : public LuaObject
 {
 public:
+    enum {
+        MAX_THINGS = 10
+    };
+
     Tile(const Position& position);
 
     void draw(const Point& dest, float scaleFactor, int drawFlags);