diff --git a/ChangeLog.md b/ChangeLog.md
index 9ad38849..2bc78e4b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,6 @@
 #2.2.19
   * Power management panel now displays modules in descending order of power usage by default
+  * Shot speed can no longer be modified directly.  Its value is derived from the range modifier for Long Range and Focused modifications
 
 #2.2.18
   * Change methodology for calculating explorer role; can result in lighter builds
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index 92f21771..1f2dea54 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -701,6 +701,16 @@ export default class Module {
    * @return {string} the shot speed for this module
    */
   getShotSpeed() {
+    if (this.blueprint && (this.blueprint.name === 'Focused' || this.blueprintname === 'Long Range')) {
+      // If the modification is focused or long range then the shot speed
+      // uses the range modifier
+      const rangemod = this.getModValue('range') / 10000;
+      let result = this['shotspeed'];
+      if (!result) {
+        return null;
+      }
+      return result * (1 + rangemod);
+    }
     return this._getModifiedValue('shotspeed');
   }