diff --git a/changelog.txt b/changelog.txt
index 54c7478a2..a84b822bf 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 01/13/2015 ==
+Uleat: Placed an upper limit on the cursor queue save loop.
+
 == 01/12/2015 ==
 Uleat: Fix for OP_FormattedMessage text link server crashes
 Uleat: Added text link translators for OP_TaskDescription (RoF+ -- all clients current)
diff --git a/common/shareddb.cpp b/common/shareddb.cpp
index 42aeebfea..b97d5a984 100644
--- a/common/shareddb.cpp
+++ b/common/shareddb.cpp
@@ -108,6 +108,7 @@ bool SharedDatabase::SaveCursor(uint32 char_id, std::list<ItemInst*>::const_iter
 
     int i = 8000;
     for(auto it = start; it != end; ++it, i++) {
+		if (i > 8999) { break; } // shouldn't be anything in the queue that indexes this high
         ItemInst *inst = *it;
         if (!SaveInventory(char_id,inst,(i == 8000) ? MainCursor : i))
             return false;