diff --git a/backend/uno-game-engine/deck.ts b/backend/uno-game-engine/deck.ts
index 58633f7..cd63871 100644
--- a/backend/uno-game-engine/deck.ts
+++ b/backend/uno-game-engine/deck.ts
@@ -75,7 +75,10 @@ export function makeCard(
  * Time complexity: O(n)
  */
 // elint-disable-next-line
-export function shuffle(deck: Array<any>) {
-    //todo: Implement a generic shuffling algorithm
-    [deck[0], deck[1]] = [deck[1], deck[0]];
+export function shuffle(deck: Array<UNOCard>) {
+    // Fisher-Yates shuffle algorithm to shuffle card deck
+    for (let i = deck.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * i);
+        [deck[i], deck[j]] = [deck[j], deck[i]];
+    }
 }