diff --git a/src/main/java/com/redstoner/modules/mail/Mail.java b/src/main/java/com/redstoner/modules/mail/Mail.java
index a272b2f..ee26842 100644
--- a/src/main/java/com/redstoner/modules/mail/Mail.java
+++ b/src/main/java/com/redstoner/modules/mail/Mail.java
@@ -544,7 +544,8 @@ public class Mail implements Module, Listener
 					list.add(m);
 					idToMsg.put(m.getID(), m);
 				}
-				playerToMsg.put(uuid, list);
+				if (!list.isEmpty())
+					playerToMsg.put(uuid, list);
 			}
 		}