:: commit 57f384eed54f9867fcd6649f461d0934d6eaa998

diff --git a/common/drivers/gop.c b/common/drivers/gop.c
index 0fbd0984..68723371 100644
--- a/common/drivers/gop.c
+++ b/common/drivers/gop.c
@@ -160,10 +160,10 @@ bool init_gop(struct fb_info *ret,
         if (status) {
             panic(false, "gop: Initialisation failed");
         }
+        status = gop->QueryMode(gop, gop->Mode == NULL ? 0 : gop->Mode->Mode,
+                                &mode_info_size, &mode_info);
     }
 
-    status = gop->QueryMode(gop, gop->Mode->Mode, &mode_info_size, &mode_info);
-
     if (status) {
         panic(false, "gop: Initialisation failed");
     }