diff --git a/code/modules/modular_computers/file_system/programs/security/guntracker.dm b/code/modules/modular_computers/file_system/programs/security/guntracker.dm
index 6f801f286c0..f7d89d454cc 100644
--- a/code/modules/modular_computers/file_system/programs/security/guntracker.dm
+++ b/code/modules/modular_computers/file_system/programs/security/guntracker.dm
@@ -56,7 +56,7 @@
 				)
 			wireless_firing_pins_data[++wireless_firing_pins_data.len] = guntracker_info
 
-	data["wireless_firing_pins"] = sortByKey(wireless_firing_pins_data, "registered_info")
+	data["wireless_firing_pins"] = wireless_firing_pins_data
 
 	return data
 
diff --git a/html/changelogs/johnwildkins-firearmfix3.yml b/html/changelogs/johnwildkins-firearmfix3.yml
new file mode 100644
index 00000000000..c9be9abefbb
--- /dev/null
+++ b/html/changelogs/johnwildkins-firearmfix3.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+  - backend: "Moves firearm control sorting to clientside, hopefully alleviating issues."
diff --git a/vueui/src/components/view/mcomputer/security/guntracker.vue b/vueui/src/components/view/mcomputer/security/guntracker.vue
index 272c7f6fa02..1ec27b0f2c4 100644
--- a/vueui/src/components/view/mcomputer/security/guntracker.vue
+++ b/vueui/src/components/view/mcomputer/security/guntracker.vue
@@ -7,7 +7,7 @@
         <th>Firearm</th>
         <th>Settings</th>
       </tr>
-      <tr v-for="gun in wireless_firing_pins" class="item border" :key="gun.ref">
+      <tr v-for="gun in sorted_pins" class="item border" :key="gun.ref">
         <td>{{ gun.registered_info }}</td>
         <td>{{ gun.gun_name }}</td>
         <td>
@@ -25,6 +25,11 @@
 export default {
   data() {
     return this.$root.$data.state;
+  },
+  computed: {
+    sorted_pins: function() {
+      return this.wireless_firing_pins.slice(0).sort((a, b) => (a.registered_info > b.registered_info) ? 1 : -1)
+    }
   }
 }
 </script>