Index: src/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java
===================================================================
--- src/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java	(revision 9288)
+++ src/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java	(revision 9289)
@@ -235,8 +235,9 @@
                 }
                 else {
                     try {
-                        if (packet.getSubject() != null && packet.getSubject().trim().length() > 0
-                                && Message.Type.groupchat == packet.getType()) {
+                        if (packet.getSubject() != null && packet.getSubject().trim().length() > 0 &&
+                                Message.Type.groupchat == packet.getType() &&
+                                (packet.getBody() == null || packet.getBody().trim().isEmpty())) {
                             // An occupant is trying to change the room's subject
                             role.getChatRoom().changeSubject(packet, role);