diff --git a/source_modules/usrp_source/src/main.cpp b/source_modules/usrp_source/src/main.cpp
index 99057faa..793d4887 100644
--- a/source_modules/usrp_source/src/main.cpp
+++ b/source_modules/usrp_source/src/main.cpp
@@ -137,14 +137,8 @@ public:
         samplerates.clear();
         auto srList = dev->get_rx_rates(chanId);
         for (auto& l : srList) {
-            // If a single value, add it to the list
-            if (l.step() == 0.0 || l.start() == l.stop()) {
-                samplerates.define(l.start(), getBandwdithScaled(l.start()), l.start());
-                continue;
-            }
-
-            // Otherwise, save all entries to the list
-            for (double f = l.start(); f <= l.stop(); f += l.step()) {
+            double step = (l.step() == 0.0) ? 100e3 : l.step();
+            for (double f = l.start(); f <= l.stop(); f += step) {
                 samplerates.define(f, getBandwdithScaled(f), f);
             }
         }
@@ -164,7 +158,6 @@ public:
         bandwidths.define(0, "Auto", 0);
         uhd::meta_range_t bwRange = dev->get_rx_bandwidth_range(chanId);
         for (const auto& r : bwRange) {
-            // Otherwise, save all entries to the list
             double step = (r.step() == 0.0) ? 100e3 : r.step();
             for (double i = r.start(); i <= r.stop(); i += step) {
                 bandwidths.define((int)i, getBandwdithScaled(i), i);