diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
index 6988d6cc8..6c065a392 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
@@ -79,25 +79,6 @@ public class JavaLoginTranslator extends PacketTranslator<ClientboundLoginPacket
             // Remove extra hearts, hunger, etc.
             entity.resetAttributes();
             entity.resetMetadata();
-
-            // Reset weather
-            if (session.isRaining()) {
-                LevelEventPacket stopRainPacket = new LevelEventPacket();
-                stopRainPacket.setType(LevelEvent.STOP_RAINING);
-                stopRainPacket.setData(0);
-                stopRainPacket.setPosition(Vector3f.ZERO);
-                session.sendUpstreamPacket(stopRainPacket);
-                session.setRaining(false);
-            }
-
-            if (session.isThunder()) {
-                LevelEventPacket stopThunderPacket = new LevelEventPacket();
-                stopThunderPacket.setType(LevelEvent.STOP_THUNDERSTORM);
-                stopThunderPacket.setData(0);
-                stopThunderPacket.setPosition(Vector3f.ZERO);
-                session.sendUpstreamPacket(stopThunderPacket);
-                session.setThunder(false);
-            }
         }
 
         session.setWorldName(spawnInfo.getWorldName());
diff --git a/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
index 8446a340a..02ed1bc5f 100644
--- a/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java
@@ -27,6 +27,7 @@ package org.geysermc.geyser.util;
 
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.math.vector.Vector3i;
+import org.cloudburstmc.protocol.bedrock.data.LevelEvent;
 import org.cloudburstmc.protocol.bedrock.data.PlayerActionType;
 import org.cloudburstmc.protocol.bedrock.packet.*;
 import org.geysermc.geyser.entity.type.Entity;
@@ -110,6 +111,20 @@ public class DimensionUtils {
         // Effects are re-sent from server
         entityEffects.clear();
 
+        // Always reset weather, as it sometimes suddenly starts raining. See https://github.com/GeyserMC/Geyser/issues/3679
+        LevelEventPacket stopRainPacket = new LevelEventPacket();
+        stopRainPacket.setType(LevelEvent.STOP_RAINING);
+        stopRainPacket.setData(0);
+        stopRainPacket.setPosition(Vector3f.ZERO);
+        session.sendUpstreamPacket(stopRainPacket);
+        session.setRaining(false);
+        LevelEventPacket stopThunderPacket = new LevelEventPacket();
+        stopThunderPacket.setType(LevelEvent.STOP_THUNDERSTORM);
+        stopThunderPacket.setData(0);
+        stopThunderPacket.setPosition(Vector3f.ZERO);
+        session.sendUpstreamPacket(stopThunderPacket);
+        session.setThunder(false);
+
         //let java server handle portal travel sound
         StopSoundPacket stopSoundPacket = new StopSoundPacket();
         stopSoundPacket.setStoppingAllSound(true);