diff --git a/src/main/kotlin/club/mcscrims/speedhg/listener/GameStateListener.kt b/src/main/kotlin/club/mcscrims/speedhg/listener/GameStateListener.kt
index 072f240..c054e4a 100644
--- a/src/main/kotlin/club/mcscrims/speedhg/listener/GameStateListener.kt
+++ b/src/main/kotlin/club/mcscrims/speedhg/listener/GameStateListener.kt
@@ -5,6 +5,7 @@ import club.mcscrims.speedhg.game.GameState
 import club.mcscrims.speedhg.util.sendMsg
 import org.bukkit.Material
 import org.bukkit.Sound
+import org.bukkit.attribute.Attribute
 import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.EventHandler
@@ -351,4 +352,12 @@ class GameStateListener : Listener {
 		event.isCancelled = true
 	}
 
+	@EventHandler
+	fun onJoin( event: PlayerJoinEvent ) = setAttackSpeed( event.player )
+	
+	@EventHandler
+	fun onQuit( event: PlayerQuitEvent ) = setAttackSpeed( event.player )
+
+	private fun setAttackSpeed( player: Player ) = player.getAttribute( Attribute.GENERIC_ATTACK_SPEED )?.baseValue = 2.0
+
 }
\ No newline at end of file