diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 9816bf4f66..d5138ba060 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -269,7 +269,7 @@ u32 GPUCommon::EnqueueList(u32 listpc, u32 stall, int subIntrBase, PSPPointer<Ps
 	if (args.IsValid() && args->context.IsValid())
 		dl.context = args->context;
 	else
-		dl.context = NULL;
+		dl.context = 0;
 
 	if (head) {
 		if (currentList) {
@@ -465,7 +465,7 @@ bool GPUCommon::InterpretList(DisplayList &list) {
 	//	return false;
 	currentList = &list;
 
-	if (!list.started && list.context != NULL) {
+	if (!list.started && list.context.IsValid()) {
 		gstate.Save(list.context);
 	}
 	list.started = true;
@@ -910,7 +910,7 @@ void GPUCommon::ExecuteOp(u32 op, u32 diff) {
 					currentList->waitTicks = startingTicks + cyclesExecuted;
 					busyTicks = std::max(busyTicks, currentList->waitTicks);
 					__GeTriggerSync(WAITTYPE_GELISTSYNC, currentList->id, currentList->waitTicks);
-					if (currentList->started && currentList->context != NULL) {
+					if (currentList->started && currentList->context.IsValid()) {
 						gstate.Restore(currentList->context);
 						ReapplyGfxStateInternal();
 					}
@@ -931,15 +931,50 @@ void GPUCommon::ExecuteOp(u32 op, u32 diff) {
 	}
 }
 
+struct DisplayListOld {
+	int id;
+	u32 startpc;
+	u32 pc;
+	u32 stall;
+	DisplayListState state;
+	SignalBehavior signal;
+	int subIntrBase;
+	u16 subIntrToken;
+	DisplayListStackEntry stack[32];
+	int stackptr;
+	bool interrupted;
+	u64 waitTicks;
+	bool interruptsEnabled;
+	bool pendingInterrupt;
+	bool started;
+	size_t contextPtr;
+	u32 offsetAddr;
+	bool bboxResult;
+};
+
 void GPUCommon::DoState(PointerWrap &p) {
 	easy_guard guard(listLock);
 
-	auto s = p.Section("GPUCommon", 1);
+	auto s = p.Section("GPUCommon", 1, 2);
 	if (!s)
 		return;
 
 	p.Do<int>(dlQueue);
-	p.DoArray(dls, ARRAY_SIZE(dls));
+	if (s >= 2) {
+		p.DoArray(dls, ARRAY_SIZE(dls));
+	} else {
+		// Can only be in read mode here.
+		for (size_t i = 0; i < ARRAY_SIZE(dls); ++i) {
+			DisplayListOld oldDL;
+			p.Do(oldDL);
+			// On 32-bit, they're the same, on 64-bit oldDL is bigger.
+			memcpy(&dls[i], &oldDL, sizeof(DisplayList));
+			// Fix the other fields.  Let's hope context wasn't important, it was a pointer.
+			dls[i].context = 0;
+			dls[i].offsetAddr = oldDL.offsetAddr;
+			dls[i].bboxResult = oldDL.bboxResult;
+		}
+	}
 	int currentID = 0;
 	if (currentList != NULL) {
 		ptrdiff_t off = currentList - &dls[0];
@@ -970,7 +1005,7 @@ void GPUCommon::InterruptEnd(int listid) {
 	dl.pendingInterrupt = false;
 	// TODO: Unless the signal handler could change it?
 	if (dl.state == PSP_GE_DL_STATE_COMPLETED || dl.state == PSP_GE_DL_STATE_NONE) {
-		if (dl.started && dl.context != NULL) {
+		if (dl.started && dl.context.IsValid()) {
 			gstate.Restore(dl.context);
 			ReapplyGfxState();
 		}
diff --git a/GPU/GPUInterface.h b/GPU/GPUInterface.h
index ddf643bbc0..eb46ad713e 100644
--- a/GPU/GPUInterface.h
+++ b/GPU/GPUInterface.h
@@ -133,7 +133,7 @@ struct DisplayList
 	bool interruptsEnabled;
 	bool pendingInterrupt;
 	bool started;
-	u32_le *context;
+	PSPPointer<u32_le> context;
 	u32 offsetAddr;
 	bool bboxResult;
 };