diff --git a/src/routes/kahootclone/host/components/lobby/display.svelte b/src/routes/kahootclone/host/components/lobby/display.svelte
index 495fee0..3f20d45 100644
--- a/src/routes/kahootclone/host/components/lobby/display.svelte
+++ b/src/routes/kahootclone/host/components/lobby/display.svelte
@@ -11,5 +11,6 @@
 <h1 class="m-[0] rounded-2xl bg-gray-700 pt-1.5 pr-2 pb-0 pl-2 font-mono text-5xl">
 	{gamePin.v}
 </h1>
+<img src="https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=url:https://classroomstuff.xyz/kahootclone/join?gamepin={gamePin.v}" alt="qr to join game" class="m-5 h-36 w-36 rounded-lg border-2 border-gray-600" />
 <Players />
 <StartGame gamePin={gamePin.v} />
diff --git a/src/routes/kahootclone/join/+page.svelte b/src/routes/kahootclone/join/+page.svelte
index 9962e89..49d3f9f 100644
--- a/src/routes/kahootclone/join/+page.svelte
+++ b/src/routes/kahootclone/join/+page.svelte
@@ -2,10 +2,19 @@
 	import toast from "svelte-5-french-toast";
 	import { joinGame } from "./logic/joinGame.js";
 	import { Checking } from "./logic/JoinGameData.svelte.js";
+	import { on } from "svelte/events";
+	import { onMount } from "svelte";
 	
-
 	let pin;
 	let name;
+
+	onMount(() => {
+		const urlParams = new URLSearchParams(window.location.search);
+		const gamepin = urlParams.get('gamepin');
+		if (gamepin) {
+			pin = gamepin;
+		}
+	});
 </script>
 
 <div class="bg-grey-900 flex h-full items-center justify-center">