diff --git a/src/Parsee/Data.c b/src/Parsee/Data.c
index f5c20fe..d4bf6cb 100644
--- a/src/Parsee/Data.c
+++ b/src/Parsee/Data.c
@@ -177,9 +177,10 @@ ParseeCleanup(void *datp)
     } \
     while (0)
 
-        CleanupField(stanza,    30 MINUTES, 50);
-        CleanupField(event,     30 MINUTES, 50);
-        CleanupField(id,        30 MINUTES, 50);
+        /* TODO: Custom retention period for any 1.0 */
+        CleanupField(stanza,    30 MINUTES, 500);
+        CleanupField(event,     30 MINUTES, 500);
+        CleanupField(id,        30 MINUTES, 500);
 #undef CleanupField
     }
     DbListFree(chats);
@@ -231,9 +232,9 @@ ParseeCleanup(void *datp)
     } \
     while (0)
 
-        CleanupField(stanza,    3 HOURS, 50);
-        CleanupField(event,     3 HOURS, 50);
-        CleanupField(id,        3 HOURS, 50);
+        CleanupField(stanza,    3 HOURS, 500);
+        CleanupField(event,     3 HOURS, 500);
+        CleanupField(id,        3 HOURS, 500);
 
         DbUnlock(data->db, ref);
     }