diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index c12b728a..0e701be1 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -1510,7 +1510,7 @@ void akimbo::onammopicked()
     if(owner==player1)
     {
         // if(owner->weaponsel->type!=GUN_SNIPER && owner->weaponsel->type!=GUN_GRENADE) owner->weaponswitch(this);
-        if(akimboautoswitch) owner->weaponswitch(this); // Give the client full control over akimbo auto-switching // Bukz 2011apr23
+        if(akimboautoswitch || owner->weaponsel->type==GUN_PISTOL) owner->weaponswitch(this); // Give the client full control over akimbo auto-switching // Bukz 2011apr23
         addmsg(SV_AKIMBO, "ri", lastmillis);
     }
 }