diff --git a/plugins/BadWords/config.py b/plugins/BadWords/config.py
index 2961f348e..bbd32e64a 100644
--- a/plugins/BadWords/config.py
+++ b/plugins/BadWords/config.py
@@ -52,7 +52,7 @@ BadWords = conf.registerPlugin('BadWords')
 conf.registerGlobalValue(BadWords, 'words',
     LastModifiedSetOfStrings([], _("""Determines what words are
     considered to be 'bad' so the bot won't say them.""")))
-conf.registerGlobalValue(BadWords,'requireWordBoundaries',
+conf.registerChannelValue(BadWords,'requireWordBoundaries',
     registry.Boolean(False, _("""Determines whether the bot will require bad
     words to be independent words, or whether it will censor them within other
     words.  For instance, if 'darn' is a bad word, then if this is true, 'darn'
diff --git a/plugins/BadWords/plugin.py b/plugins/BadWords/plugin.py
index 5e3ba816d..1ccd092a3 100644
--- a/plugins/BadWords/plugin.py
+++ b/plugins/BadWords/plugin.py
@@ -104,7 +104,7 @@ class BadWords(callbacks.Privmsg):
 
     def makeRegexp(self, iterable):
         s = '(%s)' % '|'.join(map(re.escape, iterable))
-        if self.registryValue('requireWordBoundaries'):
+        if self.registryValue('requireWordBoundaries', channel):
             s = r'\b%s\b' % s
         self.regexp = re.compile(s, re.I)