diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index 7d173d75..d99447b5 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -187,7 +187,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
                     + "Fire spread is currently globally disabled for this world.");
         }
         
-        if (plugin.inGroup(player, "wg-invincible")
+        if (cfg.autoGodMode && plugin.inGroup(player, "wg-invincible") 
                 || (cfg.autoGodMode && plugin.hasPermission(player, "worldguard.auto-invincible"))) {
             cfg.enableGodMode(player);
         }