diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
index ecccd926e..c79cf1dec 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
@@ -560,6 +560,10 @@
         End Sub
 
         Private Sub UpdateMainMenu(ByVal BattleScreen As BattleScreen)
+            If BattleScreen.ClearMenuTime = True Then
+                _mainMenuItemList.Clear()
+                BattleScreen.ClearMenuTime = False
+            End If
             If _mainMenuItemList.Count = 0 Then
                 CreateMainMenuItems(BattleScreen)
             End If
@@ -570,10 +574,6 @@
             End If
 
             UpdateMenuOptions(_mainMenuIndex, _mainMenuNextIndex, _mainMenuItemList.Count)
-            If BattleScreen.ClearMenuTime = True Then
-                _mainMenuItemList.Clear()
-                BattleScreen.ClearMenuTime = False
-            End If
         End Sub
 
         Private Sub CreateMainMenuItems(ByVal BattleScreen As BattleScreen)
diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
index ef474febe..cba6fe57d 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
@@ -823,6 +823,8 @@ nextIndex:
                     ClientWaitForData = False
                     ReceivedPokemonData = False
                     BattleMenu.Reset()
+                    ClearMenuTime = True
+                    BattleMenu.Update(Me)
                 End If
             End If
             If Me.IsHost = False And Me.LockData <> "{}" And ReceivedPokemonData = False And ClientWaitForData = False And IsRemoteBattle = True Then