diff --git a/src/Defaults/index.ts b/src/Defaults/index.ts
index e46035d8..e940efa0 100644
--- a/src/Defaults/index.ts
+++ b/src/Defaults/index.ts
@@ -62,7 +62,9 @@ export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 	markOnlineOnConnect: true,
 	syncFullHistory: true,
 	patchMessageBeforeSending: msg => msg,
-	shouldSyncHistoryMessage: () => true,
+	shouldSyncHistoryMessage: ({ syncType }: proto.Message.IHistorySyncNotification) => {
+		return syncType !== proto.HistorySync.HistorySyncType.FULL
+	},
 	shouldIgnoreJid: () => false,
 	linkPreviewImageThumbnailWidth: 192,
 	transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
diff --git a/src/Socket/index.ts b/src/Socket/index.ts
index 3ee2d850..97c4785e 100644
--- a/src/Socket/index.ts
+++ b/src/Socket/index.ts
@@ -9,13 +9,6 @@ const makeWASocket = (config: UserFacingSocketConfig) => {
 		...config
 	}
 
-	// If the user hasn't provided their own history sync function,
-	// let's create a default one that respects the syncFullHistory flag.
-	// TODO: Change
-	if (config.shouldSyncHistoryMessage === undefined) {
-		newConfig.shouldSyncHistoryMessage = () => !!newConfig.syncFullHistory
-	}
-
 	return makeCommunitiesSocket(newConfig)
 }