diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 96a5df3b464..d805db0f1da 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -1721,11 +1721,24 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 			return Err(PeerHandleError { }.into());
 		}
 
-		if let wire::Message::GossipTimestampFilter(_msg) = message {
+		if let wire::Message::GossipTimestampFilter(msg) = message {
 			// When supporting gossip messages, start initial gossip sync only after we receive
 			// a GossipTimestampFilter
+
+			#[allow(unused_mut, unused_assignments)]
+			let mut full_sync_threshold = 0;
+			#[cfg(feature = "std")]
+			{
+				// if the timestamp range starts more than an hour ago, do a fully sync
+				// otherwise, start at the current time
+				use std::time::{SystemTime, UNIX_EPOCH};
+				full_sync_threshold = SystemTime::now().duration_since(UNIX_EPOCH).expect("Time must be > 1970").as_secs() - 3600;
+			}
+
 			if peer_lock.their_features.as_ref().unwrap().supports_gossip_queries() &&
-				!peer_lock.sent_gossip_timestamp_filter {
+				!peer_lock.sent_gossip_timestamp_filter &&
+				(msg.first_timestamp as u64) <= full_sync_threshold
+			{
 				peer_lock.sent_gossip_timestamp_filter = true;
 				peer_lock.sync_status = InitSyncTracker::ChannelsSyncing(0);
 			}