diff --git a/CTFd/themes/original/static/js/scoreboard.js b/CTFd/themes/original/static/js/scoreboard.js
index c0cc0b6f..e8b8c976 100644
--- a/CTFd/themes/original/static/js/scoreboard.js
+++ b/CTFd/themes/original/static/js/scoreboard.js
@@ -50,6 +50,14 @@ function scoregraph () {
             traces.push(trace);
         }
 
+        traces.sort(function(a, b) {
+            var scorediff = b['y'][b['y'].length - 1] - a['y'][a['y'].length - 1];
+            if(!scorediff) {
+                return a['x'][a['x'].length - 1] - b['x'][b['x'].length - 1];
+            }
+            return scorediff;
+        });
+
         var layout = {
             title: 'Top 10 Teams',
             paper_bgcolor: 'rgba(0,0,0,0)',