diff --git a/sql/infolinkshell.sql b/sql/infolinkshell.sql
index 66e7b224..a9e54d6c 100644
--- a/sql/infolinkshell.sql
+++ b/sql/infolinkshell.sql
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `infolinkshell`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `infolinkshell` (
-  `LinkshellId` int(20) NOT NULL AUTO_INCREMENT,
+  `LinkshellId` bigint(20) NOT NULL AUTO_INCREMENT,
   `MasterCharacterId` int(20) DEFAULT NULL,
   `CharacterIdList` blob,
   `LinkshellName` varchar(32) DEFAULT NULL,
diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp b/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp
index ab95f728..ffcfc9af 100644
--- a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp
+++ b/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp
@@ -29,7 +29,7 @@ bool Core::LinkshellMgr::loadLinkshells()
 
    do
    {
-      uint32_t linkshellId = field[0].get< uint32_t >();
+      uint64_t linkshellId = field[0].get< uint64_t >();
       uint32_t masterId = field[1].get< uint32_t >();
       std::string name = field[3].getString();
 
@@ -71,7 +71,7 @@ Core::LinkshellPtr Core::LinkshellMgr::getLinkshellByName( const std::string& na
       return it->second;
 }
 
-Core::LinkshellPtr Core::LinkshellMgr::getLinkshellById( uint32_t lsId )
+Core::LinkshellPtr Core::LinkshellMgr::getLinkshellById( uint64_t lsId )
 {
    auto it = m_linkshellIdMap.find( lsId );
    if( it == m_linkshellIdMap.end() )
diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.h b/src/servers/Server_Zone/Linkshell/LinkshellMgr.h
index 887b1f4b..8237bb55 100644
--- a/src/servers/Server_Zone/Linkshell/LinkshellMgr.h
+++ b/src/servers/Server_Zone/Linkshell/LinkshellMgr.h
@@ -12,11 +12,11 @@ typedef boost::shared_ptr< Linkshell > LinkshellPtr;
 class LinkshellMgr
 {
 private:
-   std::map< uint32_t, LinkshellPtr > m_linkshellIdMap;
+   std::map< uint64_t, LinkshellPtr > m_linkshellIdMap;
    std::map< std::string, LinkshellPtr > m_linkshellNameMap;
 
    LinkshellPtr getLinkshellByName( const std::string& name );
-   LinkshellPtr getLinkshellById( uint32_t lsId );
+   LinkshellPtr getLinkshellById( uint64_t lsId );
 
 public:
    LinkshellMgr();