diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java
index c5cd8faf57..7eda2656fc 100644
--- a/src/main/java/client/Character.java
+++ b/src/main/java/client/Character.java
@@ -8297,6 +8297,15 @@ public class Character extends AbstractCharacterObject {
                     }
                 }
 
+                /*
+                 * Bugs when player first time into server
+                 * The storage won't get initialize
+                 * and must wait until next login
+                 */
+                if (getStorage() == null) {
+                    Server.getInstance().getWorld(world).loadAccountStorage(accountid);
+                }
+
                 con.commit();
                 return true;
             } catch (Exception e) {