diff --git a/source/src/cube.h b/source/src/cube.h
index 75ceffb8..ad067ff2 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -208,7 +208,7 @@ enum { MCMD_KICK = 0, MCMD_BAN, MCMD_REMBANS };
 #define m_noitemsnade (gamemode==9)
 #define m_nopistol	  (gamemode==10 || gamemode==11)
 #define m_noprimary   (m_pistol)
-#define m_noguns	  (m_nopistol && m_noprimary)
+#define m_noguns	  (m_lss)
 #define m_arena       (gamemode==3 || gamemode==4 || gamemode==9 || gamemode==10 || gamemode==11)
 #define m_tarena      (gamemode==4 || gamemode==11)
 #define m_teammode    (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11)
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index e42c889c..6a69223b 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -613,7 +613,7 @@ void shoot(playerent *d, vec &targ)
 		d->lastaction = lastmillis;
 		d->lastattackgun = d->gunselect;
 
-		if(!hasammo(d)) { d->shots = 0; return; };
+		if(d->gunselect!=GUN_KNIFE && !hasammo(d)) { d->shots = 0; return; };
 			
 		if(guns[d->gunselect].isauto) d->shots++;
 		else d->attacking = false;
@@ -625,7 +625,7 @@ void shoot(playerent *d, vec &targ)
 			akimboside = !akimboside;
 		}
 	    
-		if(d->gunselect) d->mag[d->gunselect]--;
+		if(d->gunselect!=GUN_KNIFE) d->mag[d->gunselect]--;
 		from.z -= 0.2f;    // below eye
 	};