diff --git a/code/controllers/subsystems/statpanel.dm b/code/controllers/subsystems/statpanel.dm
index 14670f3e7f3..c8241d9b5d2 100644
--- a/code/controllers/subsystems/statpanel.dm
+++ b/code/controllers/subsystems/statpanel.dm
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(statpanels)
 		var/client/target = currentrun[length(currentrun)]
 		currentrun.len--
 
-		if(!target.stat_panel || !target.stat_panel.is_ready())
+		if(!target?.stat_panel?.is_ready())
 			continue
 
 		if(target.stat_tab == "Status" && num_fires % status_wait == 0)
diff --git a/html/changelogs/hellfirejag-statpanel-runtime-fix.yml b/html/changelogs/hellfirejag-statpanel-runtime-fix.yml
new file mode 100644
index 00000000000..4d89ec62cdf
--- /dev/null
+++ b/html/changelogs/hellfirejag-statpanel-runtime-fix.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Fixed a runtime error caused by a player attempting to view the statpanel before its ready."