diff --git a/megamek/src/megamek/common/Compute.java b/megamek/src/megamek/common/Compute.java
index 5b13c7f0e41..4176ee72551 100644
--- a/megamek/src/megamek/common/Compute.java
+++ b/megamek/src/megamek/common/Compute.java
@@ -4969,7 +4969,13 @@ public static SensorRangeHelper getSensorRanges(Game game, Entity e) {
         if (null == e.getActiveSensor()) {
             return null;
         }
-        int bracket = Compute.getSensorBracket(e.getSensorCheck());
+
+        int check = e.getSensorCheck();
+        if ((null != e.getCrew()) && e.hasAbility(OptionsConstants.UNOFF_SENSOR_GEEK)) {
+            check -= 2;
+        }
+
+        int bracket = Compute.getSensorBracket(check);
         if (e.isSpaceborne()) {
             bracket = Compute.getSensorBracket(7);
         }