diff --git a/P3D/Network/Profiles/Emblem.vb b/P3D/Network/Profiles/Emblem.vb
index bc2715e07..af3d3d21c 100644
--- a/P3D/Network/Profiles/Emblem.vb
+++ b/P3D/Network/Profiles/Emblem.vb
@@ -968,8 +968,17 @@
         End Function
 
         Public Shared Sub GetAchievedEmblems()
-            Dim APICall As New APICall(AddressOf AddAchievedEmblems)
-            APICall.FetchAllAchievedTrophies()
+            For Each newEmblem In Core.Player.EarnedAchievements
+                If Not Core.GameJoltSave.AchievedEmblems.Contains(newEmblem) Then
+                    Core.GameJoltSave.AchievedEmblems.Add(newEmblem)
+                End If
+            Next
+
+            If Core.GameJoltSave.AchievedEmblems.Contains("trainer") = False Then
+                Core.GameJoltSave.AchievedEmblems.Add("trainer")
+            End If
+            'Dim APICall As New APICall(AddressOf AddAchievedEmblems)
+            'APICall.FetchAllAchievedTrophies()
         End Sub
 
         Private Shared Sub AddAchievedEmblems(ByVal result As String)
diff --git a/P3D/Player/Player.vb b/P3D/Player/Player.vb
index 81ff480a8..f7c94006d 100644
--- a/P3D/Player/Player.vb
+++ b/P3D/Player/Player.vb
@@ -537,6 +537,7 @@
         GameMode = "Kolben"
 
         LoadPlayer()
+        GameJolt.Emblem.GetAchievedEmblems()
 
         If GameModeManager.GameModeExists(GameMode) = False Then
             GameMode = "Kolben"
diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb
index d1aeeb07b..0cc995d82 100644
--- a/P3D/Screens/MainMenu/PressStartScreen.vb
+++ b/P3D/Screens/MainMenu/PressStartScreen.vb
@@ -1539,7 +1539,6 @@ Public Class NewMainMenuScreen
                             If _isGameJolt Then
                                 Core.Player.IsGameJoltSave = True
                                 Core.Player.LoadGame("GAMEJOLTSAVE")
-                                GameJolt.Emblem.GetAchievedEmblems()
 
                                 SetScreen(New JoinServerScreen(CurrentScreen))
                             Else