diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 71253a4bd3c5..7d275063e2ea 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1016,7 +1016,7 @@ SELECT  DISTINCT ST.element AS ID
   SELECT  DISTINCT S.id,
                    S.name,
                    SI.server_id AS MGR_SERVER,
-                   PI.server_id AS PROXY,
+                   PI.server_id is not null AS PROXY,
                    TO_CHAR(Sinfo.checkin, 'YYYY-MM-DD HH24:MI:SS') AS LAST_CHECKIN,
                    SO.SECURITY_ERRATA, SO.BUG_ERRATA, SO.ENHANCEMENT_ERRATA, SO.LOCKED,
                    SO.OUTDATED_PACKAGES, SO.SERVER_NAME, SO.SERVER_ADMINS, SO.GROUP_COUNT,
diff --git a/java/spacewalk-java.changes.welder.bsc1214316 b/java/spacewalk-java.changes.welder.bsc1214316
new file mode 100644
index 000000000000..bc6284389076
--- /dev/null
+++ b/java/spacewalk-java.changes.welder.bsc1214316
@@ -0,0 +1 @@
+- Fix Most Critical Systems list (bsc#1214316)