diff --git a/SQCSim-srv/connection.cpp b/SQCSim-srv/connection.cpp
index c7b1cb1..2c1948b 100644
--- a/SQCSim-srv/connection.cpp
+++ b/SQCSim-srv/connection.cpp
@@ -171,12 +171,14 @@ Timestamp Connection::Run(World* world) {
 		}
 		else toggle = false;
 
-		out.states.jumpshot = false;
+		out.states.shooting = in.keys.shoot;
+
+		if (out.states.jumping && out.states.shooting)
+			out.states.jumpshot = true;
+		else out.states.jumpshot = false;
+
 		if (in.keys.shoot && m_shoot_acc <= 0.) {
 			Bullets.emplace_back(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true)));
-			out.states.shooting = true;
-			if (out.states.jumping)
-				out.states.jumpshot = true;
 			m_shoot_acc = BULLET_TIME;
 		}