diff --git a/internal/graphicscommand/command.go b/internal/graphicscommand/command.go
index 63e1703aa..7552fb265 100644
--- a/internal/graphicscommand/command.go
+++ b/internal/graphicscommand/command.go
@@ -249,7 +249,12 @@ func (q *commandQueue) flush(graphicsDriver graphicsdriver.Graphics, endFrame bo
 // FlushCommands flushes the command queue and present the screen if needed.
 // If endFrame is true, the current screen might be used to present.
 func FlushCommands(graphicsDriver graphicsdriver.Graphics, endFrame bool) error {
-	resolveImages()
+	// Resolve unresolved images only when the frame ends.
+	// Resolving in tests might cause test flakiness on browsers (#2391).
+	// TODO: Investigate why.
+	if endFrame {
+		resolveImages()
+	}
 
 	return theCommandQueue.Flush(graphicsDriver, endFrame)
 }