diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
index d4ab8aa79..6480ec752 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
@@ -187,8 +187,24 @@ public class RestrictedGuacamoleTunnelService
             @Override
             public int compare(ModeledConnection a, ModeledConnection b) {
 
-                return ((getActiveConnections(a).size() + 1) * b.getConnectionWeight() -
-                            (getActiveConnections(b).size() + 1) * a.getConnectionWeight());
+                // Active connections
+                int Ca = getActiveConnections(a).size();
+                int Cb = getActiveConnections(b).size();
+
+                // Assigned weight
+                int Wa = a.getConnectionWeight();
+                int Wb = b.getConnectionWeight();
+
+                // Net weight of connections
+                int NWa = Ca * Wb;
+                int NWb = Cb * Wa;
+
+                // If net weights are equal, return difference in weight
+                if (NWa == NWb)
+                    return (Wa - Wb);
+
+                // Return different in net weights
+                return (NWa - NWb);
 
             }