diff --git a/Source/Contents/Jobs/JobInheritance.cpp b/Source/Contents/Jobs/JobInheritance.cpp
index b3aaed3d0..453362b13 100644
--- a/Source/Contents/Jobs/JobInheritance.cpp
+++ b/Source/Contents/Jobs/JobInheritance.cpp
@@ -1073,8 +1073,15 @@ bool __stdcall IsJobWeaponAllowed(int job, int slot, std::int64_t weapon) {
   case JT_GUNSLINGER_B:
   case JT_REBELLION_B:
   case JT_NIGHT_WATCH:
-    if (view >= 18 && view <= 21) {
+    switch (view) {
+    case W_RIFLE:
+    case W_GATLING:
+    case W_SHOTGUN:
+    case W_GRENADE:
       result = true;
+      break;
+    default:
+      break;
     }
     break;
   case JT_NINJA: