diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c80ea13..14a9c6a 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -7063,7 +7093,8 @@ static void RADEONRestoreMode(ScrnInfoPt
 	}
     } else {
 	RADEONRestoreMemMapRegisters(pScrn, restore);
-	RADEONRestoreCommonRegisters(pScrn, restore);
+	if (!pRADEONEnt->RestorePrimary  && !info->IsSwitching)
+	    RADEONRestoreCommonRegisters(pScrn, restore);
 	if (info->MergedFB) {
 	    RADEONRestoreCrtc2Registers(pScrn, restore);
 	    RADEONRestorePLL2Registers(pScrn, restore);