diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index 4ce9abc7..7349e425 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -405,6 +405,7 @@ sub check_flood {
 
           my @channels = $self->{pbot}->{messagehistory}->{database}->get_channels($account);
           foreach my $chan (@channels) {
+            next if $chan !~ /^#/;
             $self->{pbot}->{chanops}->ban_user_timed("*!$user\@$host", $chan, $length);
           }
 
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index cabbb704..83be9b4c 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 596,
+  BUILD_REVISION => 597,
   BUILD_DATE     => "2014-05-20",
 };