diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c
index d4b9984f81..050d683573 100644
--- a/src/northbridge/amd/pi/agesawrapper.c
+++ b/src/northbridge/amd/pi/agesawrapper.c
@@ -179,8 +179,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void)
 	);
 	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(PostParams->StdHeader.HeapStatus);
 	AmdReleaseStruct (&AmdParamStruct);
-	/* Initialize heap space */
-	EmptyHeap();
 
 	return status;
 }
@@ -191,6 +189,9 @@ AGESA_STATUS agesawrapper_amdinitenv(void)
 	AMD_INTERFACE_PARAMS AmdParamStruct;
 	AMD_ENV_PARAMS       *EnvParam;
 
+	/* Initialize heap space */
+	EmptyHeap();
+
 	LibAmdMemFill (&AmdParamStruct,
 		       0,
 		       sizeof(AMD_INTERFACE_PARAMS),