diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
index bb97bb0d48cf41956e00a4d89a84267e6792e7de..609166ad5673abc6540013d79b48b4bc0e031695 100644
--- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java
@@ -467,7 +467,11 @@ class FeedManagerImpl implements FeedManager, Client, EventListener,
 
 		// get other information for post
 		GroupId groupId = feed.getBlogId();
-		long time = clock.currentTimeMillis();
+		long time, now = clock.currentTimeMillis();
+		Date date = entry.getUpdatedDate();
+		if (date == null) date = entry.getPublishedDate();
+		if (date == null) time = now;
+		else time = Math.max(0, Math.min(date.getTime(), now));
 		String body = getPostBody(b.toString());
 		try {
 			// create and store post