diff --git a/managers/BootstrapManager.go b/managers/BootstrapManager.go
index c9c652d..1b614fa 100644
--- a/managers/BootstrapManager.go
+++ b/managers/BootstrapManager.go
@@ -444,6 +444,8 @@ func GetFreeAgencyBootstrap(proID string) BootstrapDataFreeAgency {
 		contractMap          map[uint]structs.NFLContract
 	)
 
+	ts := GetTimestamp()
+
 	if len(proID) > 0 && proID != "0" {
 		wg.Add(6)
 
@@ -460,7 +462,7 @@ func GetFreeAgencyBootstrap(proID string) BootstrapDataFreeAgency {
 		go func() {
 			defer wg.Done()
 			freeAgentList := GetAllFreeAgents()
-			freeAgents = MakeGeneralFreeAgentList(freeAgentList)
+			freeAgents = MakeGeneralFreeAgentList(freeAgentList, ts.Phase)
 			udfas = MakeUDFAList(freeAgentList)
 		}()
 
diff --git a/managers/ListHelper.go b/managers/ListHelper.go
index ca4d0d3..66829a4 100644
--- a/managers/ListHelper.go
+++ b/managers/ListHelper.go
@@ -48,11 +48,15 @@ func MakePracticeSquadList(players []structs.NFLPlayer) []structs.NFLPlayer {
 	return playerList
 }
 
-func MakeGeneralFreeAgentList(players []structs.NFLPlayer) []structs.NFLPlayer {
+func MakeGeneralFreeAgentList(players []structs.NFLPlayer, phase uint) []structs.NFLPlayer {
 	playerList := []structs.NFLPlayer{}
-
+	baseYear := 1
+	// If UDFA phase is over, include UDFAs in general free agent list
+	if phase >= 6 {
+		baseYear = 0
+	}
 	for _, p := range players {
-		if p.IsFreeAgent && p.Experience > 1 {
+		if p.IsFreeAgent && p.Experience > uint(baseYear) {
 			playerList = append(playerList, p)
 		}
 	}