diff --git a/src/Defaults/index.ts b/src/Defaults/index.ts
index 1ac91a8..700e9e2 100644
--- a/src/Defaults/index.ts
+++ b/src/Defaults/index.ts
@@ -60,3 +60,5 @@ export const MEDIA_PATH_MAP: { [T in MediaType]: string } = {
 export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP) as MediaType[]
 
 export const KEY_BUNDLE_TYPE = Buffer.from([5])
+
+export const MIN_PREKEY_COUNT = 5
\ No newline at end of file
diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 115a44e..e664e1f 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -1,6 +1,6 @@
 
 import { proto } from '../../WAProto'
-import { KEY_BUNDLE_TYPE } from '../Defaults'
+import { KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT } from '../Defaults'
 import { BaileysEventMap, MessageReceiptType, MessageUserReceipt, SocketConfig, WAMessageStubType } from '../Types'
 import { debouncedTimeout, decodeMessageStanza, delay, encodeBigEndian, generateSignalPubKey, getStatusFromReceiptType, normalizeMessageContent, xmppPreKey, xmppSignedPreKey } from '../Utils'
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex'
@@ -9,8 +9,6 @@ import { areJidsSameUser, BinaryNode, BinaryNodeAttributes, getAllBinaryNodeChil
 import { makeChatsSocket } from './chats'
 import { extractGroupMetadata } from './groups'
 
-const MIN_PREKEY_COUNT = 5
-
 export const makeMessagesRecvSocket = (config: SocketConfig) => {
 	const {
 		logger,
diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts
index 0792a78..a4a8553 100644
--- a/src/Socket/socket.ts
+++ b/src/Socket/socket.ts
@@ -3,7 +3,7 @@ import EventEmitter from 'events'
 import { promisify } from 'util'
 import WebSocket from 'ws'
 import { proto } from '../../WAProto'
-import { DEF_CALLBACK_PREFIX, DEF_TAG_PREFIX, DEFAULT_ORIGIN, KEY_BUNDLE_TYPE } from '../Defaults'
+import { DEF_CALLBACK_PREFIX, DEF_TAG_PREFIX, DEFAULT_ORIGIN, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT } from '../Defaults'
 import { AuthenticationCreds, BaileysEventEmitter, BaileysEventMap, DisconnectReason, SocketConfig } from '../Types'
 import { addTransactionCapability, bindWaitForConnectionUpdate, configureSuccessfulPairing, Curve, encodeBigEndian, generateLoginNode, generateMdTagPrefix, generateOrGetPreKeys, generateRegistrationNode, getPreKeys, makeNoiseHandler, printQRIfNecessaryListener, promiseTimeout, useSingleFileAuthState, xmppPreKey, xmppSignedPreKey } from '../Utils'
 import { assertNodeErrorFree, BinaryNode, encodeBinaryNode, getBinaryNodeChild, S_WHATSAPP_NET } from '../WABinary'
@@ -63,7 +63,7 @@ export const makeSocket = ({
 	const keys = addTransactionCapability(authState.keys, logger)
 
 	let lastDateRecv: Date
-	let epoch = 0
+	let epoch = 1
 	let keepAliveReq: NodeJS.Timeout
 	let qrTimer: NodeJS.Timeout
 
@@ -232,9 +232,6 @@ export const makeSocket = ({
 			nextPreKeyId: Math.max(lastPreKeyId + 1, creds.nextPreKeyId),
 			firstUnuploadedPreKeyId: Math.max(creds.firstUnuploadedPreKeyId, lastPreKeyId + 1)
 		}
-		if(!creds.serverHasPreKeys) {
-			update.serverHasPreKeys = true
-		}
 
 		await keys.transaction(
 			async() => {
@@ -248,9 +245,28 @@ export const makeSocket = ({
 		ev.emit('creds.update', update)
 	}
 
+	const getAvailablePreKeysOnServer = async() => {
+		const result = await query({
+			tag: 'iq',
+			attrs: {
+				id: generateMessageTag(),
+				xmlns: 'encrypt',
+				type: 'get',
+				to: S_WHATSAPP_NET
+			},
+			content: [
+				{ tag: 'count', attrs: { } }
+			]
+		})
+		const countChild = getBinaryNodeChild(result, 'count')
+		return +countChild.attrs.value
+	}
+
 	/** generates and uploads a set of pre-keys to the server */
 	const uploadPreKeys = async(count = INITIAL_PREKEY_COUNT) => {
 		await assertingPreKeys(count, async preKeys => {
+			logger.info('uploading pre-keys')
+
 			const node: BinaryNode = {
 				tag: 'iq',
 				attrs: {
@@ -273,6 +289,14 @@ export const makeSocket = ({
 		})
 	}
 
+	const uploadPreKeysToServerIfRequired = async() => {
+		const preKeyCount = await getAvailablePreKeysOnServer()
+		logger.info(`${preKeyCount} pre-keys found on server`)
+		if(preKeyCount <= MIN_PREKEY_COUNT) {
+			await uploadPreKeys()
+		}
+	}
+
 	const onMessageRecieved = (data: Buffer) => {
 		noise.decodeFrame(data, frame => {
 			// reset ping timeout
@@ -528,10 +552,7 @@ export const makeSocket = ({
 	})
 	// login complete
 	ws.on('CB:success', async() => {
-		if(!creds.serverHasPreKeys) {
-			await uploadPreKeys()
-		}
-
+		await uploadPreKeysToServerIfRequired()
 		await sendPassiveIq('active')
 
 		logger.info('opened connection to WA')
diff --git a/src/Types/Auth.ts b/src/Types/Auth.ts
index 7e1c9c7..4ddbf93 100644
--- a/src/Types/Auth.ts
+++ b/src/Types/Auth.ts
@@ -41,7 +41,6 @@ export type AuthenticationCreds = SignalCreds & {
     signalIdentities?: SignalIdentity[]
     myAppStateKeyId?: string
     firstUnuploadedPreKeyId: number
-    serverHasPreKeys: boolean
     nextPreKeyId: number
 
     lastAccountSyncTimestamp?: number
diff --git a/src/Utils/auth-utils.ts b/src/Utils/auth-utils.ts
index 664c1f4..5ac031a 100644
--- a/src/Utils/auth-utils.ts
+++ b/src/Utils/auth-utils.ts
@@ -108,7 +108,6 @@ export const initAuthCreds = (): AuthenticationCreds => {
 
 		nextPreKeyId: 1,
 		firstUnuploadedPreKeyId: 1,
-		serverHasPreKeys: false,
 		accountSettings: {
 			unarchiveChats: false
 		}