diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
index c5db9481cd..98b5212b9b 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/driver.c
@@ -693,9 +693,6 @@ static status_t map_device(device_info *di)
 		}
 	}
 
-	/* restore original ROM shadowing setting to prevent trouble starting (some) cards */
-	set_pci(NVCFG_ROMSHADOW, 4, tmpROMshadow);
-
 	if (!tmpUlong)
 	{
 		/* ROM was not assigned an adress, fetch it from ISA legacy memory map! */
@@ -728,6 +725,9 @@ static status_t map_device(device_info *di)
 	set_pci(PCI_rom_base, 4, tmpUlong);
 	delete_area(rom_area);
 
+	/* restore original ROM shadowing setting to prevent trouble starting (some) cards */
+	set_pci(NVCFG_ROMSHADOW, 4, tmpROMshadow);
+
 	/* work out a name for the framebuffer mapping*/
 	sprintf(buffer, DEVICE_FORMAT " framebuffer",
 		di->pcii.vendor_id, di->pcii.device_id,