diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 210b0a887445..3194985ccf7b 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -600,12 +600,40 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-
- SELECT COUNT(*) AS count
- FROM rhnChannel c
- JOIN rhnAvailableChannels ac ON c.id = ac.channel_id
- WHERE c.label = :channel_label
- AND ac.org_id = :org_id
+
+
diff --git a/java/spacewalk-java.changes.nadvornik.channel_access b/java/spacewalk-java.changes.nadvornik.channel_access
new file mode 100644
index 000000000000..dc3ac6b41155
--- /dev/null
+++ b/java/spacewalk-java.changes.nadvornik.channel_access
@@ -0,0 +1 @@
+- Optimize org channel accessibility query (bsc#1211874)