diff --git a/src/Defaults/index.ts b/src/Defaults/index.ts
index a18b6449..42e81ff3 100644
--- a/src/Defaults/index.ts
+++ b/src/Defaults/index.ts
@@ -58,7 +58,7 @@ export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 	fireInitQueries: true,
 	auth: undefined as unknown as AuthenticationState,
 	markOnlineOnConnect: true,
-	syncFullHistory: false,
+	syncFullHistory: true,
 	patchMessageBeforeSending: msg => msg,
 	shouldSyncHistoryMessage: () => true,
 	shouldIgnoreJid: () => false,
@@ -119,7 +119,7 @@ export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP) as MediaType[]
 
 export const MIN_PREKEY_COUNT = 5
 
-export const INITIAL_PREKEY_COUNT = 30
+export const INITIAL_PREKEY_COUNT = 812
 
 export const UPLOAD_TIMEOUT = 30000 // 30 seconds
 export const MIN_UPLOAD_INTERVAL = 5000 // 5 seconds minimum between uploads
diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts
index 10929407..f46283cc 100644
--- a/src/Socket/socket.ts
+++ b/src/Socket/socket.ts
@@ -436,7 +436,7 @@ export const makeSocket = (config: SocketConfig) => {
 		// Prevent multiple concurrent uploads
 		if (uploadPreKeysPromise) {
 			logger.debug('Pre-key upload already in progress, waiting for completion')
-			return uploadPreKeysPromise
+			await uploadPreKeysPromise
 		}
 
 		const uploadLogic = async () => {
diff --git a/src/Utils/process-message.ts b/src/Utils/process-message.ts
index 255966bb..a8f817bb 100644
--- a/src/Utils/process-message.ts
+++ b/src/Utils/process-message.ts
@@ -229,6 +229,7 @@ const processMessage = async (
 				)
 
 				if (process) {
+					// TODO: investigate
 					if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
 						ev.emit('creds.update', {
 							processedHistoryMessages: [