diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c
index ffaa6bb70..bc42ccbf6 100644
--- a/rigs/yaesu/ft450.c
+++ b/rigs/yaesu/ft450.c
@@ -66,6 +66,7 @@ const struct rig_caps ft450_caps =
     {
 #include "level_gran_yaesu.h"
         // cppcheck-suppress *
+        [LVL_NR] = { .min = { .i = 1 }, .max = { .i = 11 }, .step = { .i = 1 } },
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 400 }, .max = { .i = 800 }, .step = { .i = 100 } },
         [LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index 69206e607..69c9ead7e 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -163,7 +163,7 @@ const struct rig_caps ft991_caps =
     .has_set_parm =       RIG_PARM_NONE,
     .level_gran = {
 #include "level_gran_yaesu.h"
-        [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f / 15.0f } },
+        [LVL_NR] = { .min = { .i = 1 }, .max = { .i = 15 }, .step = { .i = 1 } },
     },
     .ctcss_list =         common_ctcss_list,
     .dcs_list =           common_dcs_list,
diff --git a/rigs/yaesu/level_gran_yaesu.h b/rigs/yaesu/level_gran_yaesu.h
index 591f6b013..105d6901a 100644
--- a/rigs/yaesu/level_gran_yaesu.h
+++ b/rigs/yaesu/level_gran_yaesu.h
@@ -23,8 +23,9 @@
         /* level with misc units */
         [LVL_SWR]           = { .min = { .f = 0 },     .max = { .f = 5.0 },  .step = { .f = 1.0f/255.0f } },
         [LVL_BAND_SELECT]   = { .min = { .i = 0 },     .max = { .i = 16 },  .step = { .i = 1 } },
+        // most recent rigs seem to have 15 as the maximum -- other values can be set in the backend
+        [LVL_NR]            = { .min = { .i = 1 },     .max = { .i = 15 },  .step = { .i = 1 } },
         /* levels with 0-1 values -- increment based on rig's range */
-        [LVL_NR]            = { .min = { .f = 0 },     .max = { .f = 1 },    .step = { .f = 1.0f/10.0f } },
         [LVL_AF]            = { .min = { .f = 0 },     .max = { .f = 1 },  .step = { .f = 1.0f/255.0f } },
         [LVL_RF]            = { .min = { .f = 0 },     .max = { .f = 1 },  .step = { .f = 1.0f/255.0f } },
         [LVL_RFPOWER]       = { .min = { .f = .05 },   .max = { .f = 1 },    .step = { .f = 1.0f/100.0f } },