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 e752e85e..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,8 +1202,11 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                         {
                             habbo.getHabboStats().chatCounter--;
 
-                            if (Emulator.getConfig().getBoolean("flood.with.rights")) {
-                                if (habbo.getHabboStats().chatCounter > 3 && !this.hasRights(habbo)) {
+                            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) {
@@ -1213,16 +1216,6 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
                                     }
                                 }
                             }
-                            else 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);
-                                }
-                            }
-
                         }
                     } else {
                         habbo.getHabboStats().chatCounter = 0;