diff --git a/src/gba/gba-thread.c b/src/gba/gba-thread.c
index ec3b30880..9facc42bd 100644
--- a/src/gba/gba-thread.c
+++ b/src/gba/gba-thread.c
@@ -162,6 +162,8 @@ int GBAThreadStart(struct GBAThread* threadContext) {
 	threadContext->rewindBufferSize = 0;
 	if (threadContext->rewindBufferCapacity) {
 		threadContext->rewindBuffer = calloc(threadContext->rewindBufferCapacity, sizeof(void*));
+	} else {
+		threadContext->rewindBuffer = 0;
 	}
 
 	MutexInit(&threadContext->stateMutex);