diff --git a/CHANGES b/CHANGES
index 5a89fc609..e9411b7e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 Bugfixes:
  - Qt: Use safer isLoaded check in GameController
  - GBA: Fix idle skip state being retained between games
+ - Qt: Fix a race condition in PainterGL that could lead to a crash
 Misc:
  - GBA Audio: Implement missing flags on SOUNDCNT_X register
 
diff --git a/src/platform/qt/DisplayGL.cpp b/src/platform/qt/DisplayGL.cpp
index d0a5f4db3..f9fe1356e 100644
--- a/src/platform/qt/DisplayGL.cpp
+++ b/src/platform/qt/DisplayGL.cpp
@@ -205,7 +205,7 @@ void PainterGL::start() {
 }
 
 void PainterGL::draw() {
-	if (m_queue.isEmpty()) {
+	if (m_queue.isEmpty() || !GBAThreadIsActive(m_context)) {
 		return;
 	}
 	if (GBASyncWaitFrameStart(&m_context->sync, m_context->frameskip) || !m_queue.isEmpty()) {