diff --git a/sqlupdates/2_4_0 RC-1 to 2_4_0 RC-2.sql b/sqlupdates/2_4_0 RC-1 to 2_4_0 RC-2.sql
deleted file mode 100644
index c323751f..00000000
--- a/sqlupdates/2_4_0 RC-1 to 2_4_0 RC-2.sql	
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `permissions` ADD `acc_hide_mail` ENUM('0', '1') NOT NULL DEFAULT '0' AFTER `acc_hide_ip`;
\ No newline at end of file
diff --git a/sqlupdates/2_4_0-RC-1 to 2_4_0-RC-2.sql b/sqlupdates/2_4_0-RC-1 to 2_4_0-RC-2.sql
new file mode 100644
index 00000000..cb3bef84
--- /dev/null
+++ b/sqlupdates/2_4_0-RC-1 to 2_4_0-RC-2.sql	
@@ -0,0 +1,3 @@
+ALTER TABLE `permissions` ADD `acc_hide_mail` ENUM('0', '1') NOT NULL DEFAULT '0' AFTER `acc_hide_ip`;
+
+INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('flood.with.rights', '0');
\ No newline at end of file
diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
index 483744f3..10484daf 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
@@ -1202,13 +1202,18 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                         {
                             habbo.getHabboStats().chatCounter--;
 
-                            if (habbo.getHabboStats().chatCounter > 3 && !this.hasRights(habbo)) {
-                                if (this.chatProtection == 0) {
-                                    this.floodMuteHabbo(habbo, 30);
-                                } else if (this.chatProtection == 1 && habbo.getHabboStats().chatCounter > 4) {
-                                    this.floodMuteHabbo(habbo, 30);
-                                } else if (this.chatProtection == 2 && habbo.getHabboStats().chatCounter > 5) {
-                                    this.floodMuteHabbo(habbo, 30);
+                            if (habbo.getHabboStats().chatCounter > 3) {
+                                final boolean floodRights = Emulator.getConfig().getBoolean("flood.with.rights");
+                                final boolean hasRights = this.hasRights(habbo);
+
+                                if (floodRights || !hasRights) {
+                                    if (this.chatProtection == 0) {
+                                        this.floodMuteHabbo(habbo, 30);
+                                    } else if (this.chatProtection == 1 && habbo.getHabboStats().chatCounter > 4) {
+                                        this.floodMuteHabbo(habbo, 30);
+                                    } else if (this.chatProtection == 2 && habbo.getHabboStats().chatCounter > 5) {
+                                        this.floodMuteHabbo(habbo, 30);
+                                    }
                                 }
                             }
                         }