diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 1fd00cfe4..cf9bf827a 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -574,7 +574,7 @@ QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
         }
     }
     // https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390
-    if (!session->wants_online && (v == "1.16.4" || v == "1.16.5")) {
+    if ((session->user_type == "offline" || !session->wants_online) && (v == "1.16.4" || v == "1.16.5")) {
         QString invalid_url{ "https://invalid.invalid" };
         args << "-Dminecraft.api.env=custom";
         args << "-Dminecraft.api.auth.host=" + invalid_url;
diff --git a/launcher/minecraft/auth/AuthSession.cpp b/launcher/minecraft/auth/AuthSession.cpp
index f169eb834..37534f983 100644
--- a/launcher/minecraft/auth/AuthSession.cpp
+++ b/launcher/minecraft/auth/AuthSession.cpp
@@ -27,7 +27,6 @@ bool AuthSession::MakeOffline(QString offline_playername)
     access_token = "0";
     player_name = offline_playername;
     status = PlayableOffline;
-    wants_online = false;
     return true;
 }