diff --git a/src/main/java/supersymmetry/common/EventHandlers.java b/src/main/java/supersymmetry/common/EventHandlers.java
index 5476c8583..c40aca4a3 100644
--- a/src/main/java/supersymmetry/common/EventHandlers.java
+++ b/src/main/java/supersymmetry/common/EventHandlers.java
@@ -53,8 +53,6 @@ public class EventHandlers {
     @SubscribeEvent
     public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
 
-        if (event.player.isCreative()) return;
-
         NBTTagCompound playerData = event.player.getEntityData();
         NBTTagCompound data = playerData.hasKey(EntityPlayer.PERSISTED_NBT_TAG) ? playerData.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG) : new NBTTagCompound();
 
@@ -62,6 +60,7 @@ public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
 
             data.setBoolean(FIRST_SPAWN, true);
             playerData.setTag(EntityPlayer.PERSISTED_NBT_TAG, data);
+            if (event.player.isCreative()) return;
 
             EntityDropPod dropPod = new EntityDropPod(event.player.getEntityWorld(), event.player.posX, event.player.posY + 256, event.player.posZ);