diff --git a/lib/index.ts b/lib/index.ts
index 0b7fb0c..943d529 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -67,19 +67,16 @@ export interface ChainClient {
 
 // fetch a beacon for a given `roundNumber` or get the latest beacon by omitting the `roundNumber`
 export async function fetchBeacon(client: ChainClient, roundNumber?: number): Promise<RandomnessBeacon> {
-    let beacon = null
-
     if (!roundNumber) {
-        beacon = await client.latest()
-    } else if (roundNumber < 1) {
-        throw Error('Cannot request lower than round number 1')
-    } else {
-        beacon = await client.get(roundNumber)
+        roundNumber = roundAt(Date.now(), await client.chain().info())
     }
 
-    const expectedRound = roundNumber || roundAt(Date.now(), await client.chain().info())
+    if (roundNumber < 1) {
+        throw Error('Cannot request lower than round number 1')
+    }
+    const beacon = await client.get(roundNumber)
 
-    return validatedBeacon(client, beacon, expectedRound)
+    return validatedBeacon(client, beacon, roundNumber)
 }
 
 // fetch the most recent beacon to have been emitted at a given `time` in epoch ms
diff --git a/package.json b/package.json
index cef08b1..f9f52c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drand-client",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A client to the drand randomness beacon network.",
   "main": "index.js",
   "types": "index.d.ts",