diff --git a/js/app/ui/system_route.js b/js/app/ui/system_route.js
index 0c4a5a3c..393ace52 100644
--- a/js/app/ui/system_route.js
+++ b/js/app/ui/system_route.js
@@ -414,10 +414,13 @@ define([
                 system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
                 jumpData.push( system );
 
-                avgSecTemp += Number(routeNodeData.security);
+                // "source" system is not relevant for average security
+                if(i > 0){
+                    avgSecTemp += Number(routeNodeData.security);
+                }
             }
 
-            var avgSec = ( avgSecTemp /  routeData.route.length).toFixed(2);
+            var avgSec = ( avgSecTemp /  (routeData.route.length - 1)).toFixed(2);
             var avgSecForClass = Number(avgSec).toFixed(1);
 
             if(avgSecForClass <= 0){
diff --git a/public/js/v1.1.3/app/ui/system_route.js b/public/js/v1.1.3/app/ui/system_route.js
index 0c4a5a3c..393ace52 100644
--- a/public/js/v1.1.3/app/ui/system_route.js
+++ b/public/js/v1.1.3/app/ui/system_route.js
@@ -414,10 +414,13 @@ define([
                 system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
                 jumpData.push( system );
 
-                avgSecTemp += Number(routeNodeData.security);
+                // "source" system is not relevant for average security
+                if(i > 0){
+                    avgSecTemp += Number(routeNodeData.security);
+                }
             }
 
-            var avgSec = ( avgSecTemp /  routeData.route.length).toFixed(2);
+            var avgSec = ( avgSecTemp /  (routeData.route.length - 1)).toFixed(2);
             var avgSecForClass = Number(avgSec).toFixed(1);
 
             if(avgSecForClass <= 0){