diff --git a/CHANGES b/CHANGES
index 8ee8ef532..d322ea764 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@ Other fixes:
  - Qt: Force OpenGL paint engine creation thread (fixes mgba.io/i/1642)
  - Qt: Fix static compilation in MinGW (fixes mgba.io/i/1769)
  - Qt: Fix file handle leak on opening an invalid ROM
+ - Qt: Fix a race condition in the frame inspector
 Misc:
  - Debugger: Keep track of global cycle count
  - FFmpeg: Add looping option for GIF/APNG
diff --git a/src/platform/qt/FrameView.cpp b/src/platform/qt/FrameView.cpp
index 5c13f2b77..0b97fbd6c 100644
--- a/src/platform/qt/FrameView.cpp
+++ b/src/platform/qt/FrameView.cpp
@@ -386,12 +386,6 @@ void FrameView::refreshVl() {
 	m_nextFrame = VFileMemChunk(nullptr, 0);
 	if (m_currentFrame) {
 		m_controller->endVideoLog(false);
-		VFile* currentFrame = VFileMemChunk(nullptr, m_currentFrame->size(m_currentFrame));
-		void* buffer = currentFrame->map(currentFrame, m_currentFrame->size(m_currentFrame), MAP_WRITE);
-		m_currentFrame->seek(m_currentFrame, 0, SEEK_SET);
-		m_currentFrame->read(m_currentFrame, buffer, m_currentFrame->size(m_currentFrame));
-		currentFrame->unmap(currentFrame, buffer, m_currentFrame->size(m_currentFrame));
-		m_currentFrame = currentFrame;
 		QMetaObject::invokeMethod(this, "newVl");
 	}
 	m_controller->endVideoLog();
@@ -403,12 +397,16 @@ void FrameView::newVl() {
 		m_glowTimer.start();
 	}
 	QMutexLocker locker(&m_mutex);
+	if (!m_currentFrame) {
+		return;
+	}
 	if (m_vl) {
 		m_vl->deinit(m_vl);
 	}
 	m_vl = mCoreFindVF(m_currentFrame);
 	m_vl->init(m_vl);
 	m_vl->loadROM(m_vl, m_currentFrame);
+	m_currentFrame = nullptr;
 	mCoreInitConfig(m_vl, nullptr);
 	unsigned width, height;
 	m_vl->desiredVideoDimensions(m_vl, &width, &height);