diff --git a/app/Helpers/LanguageCensor.php b/app/Helpers/LanguageCensor.php
new file mode 100644
index 0000000000..f545583b5a
--- /dev/null
+++ b/app/Helpers/LanguageCensor.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * NOTICE OF LICENSE
+ *
+ * UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
+ * The details is bundled with this project in the file LICENSE.txt.
+ *
+ * @project    UNIT3D
+ * @license    https://choosealicense.com/licenses/gpl-3.0/  GNU General Public License v3.0
+ * @author     HDVinnie
+ */
+
+namespace App\Helpers;
+
+use Config;
+
+/**
+ * Class LanguageCensor
+ *
+ * A class that can redact/replace words.
+ *
+ */
+class LanguageCensor
+{
+    static protected function isSpecial($c)
+    {
+        $specialChars = " [].;,";
+        return strpos($specialChars, $c) !== false;
+    }
+
+    static protected function matchWordIndexes($string, $word)
+    {
+        $result = [];
+        $length = strlen($word);
+        $string_length = strlen($string);
+        $pos = stripos($string, $word, 0);
+        while ($pos !== false) {
+            $prev = ($pos === 0) ? ' ' : $string[$pos - 1];
+            $last = ($pos + $length) < $string_length ? $string[$pos + $length] : ' ';
+            if (self::isSpecial($prev) && self::isSpecial($last)) {
+                array_push($result, $pos);
+            }
+            $pos = stripos($string, $word, $pos + $length);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Censor a text.
+     *
+     * @param $source
+     *
+     * @return mixed
+     */
+    static public function censor($source)
+    {
+        $redactArray = Config::get('censor.redact', []);
+        foreach ($redactArray as $word) {
+            $result = "";
+            $length = strlen($source);
+            $word_length = strlen($word);
+            assert($word_length > 0);
+            $indexes = self::matchWordIndexes($source, $word);
+            $ignore = 0;
+            for ($i = 0; $i < $length; ++$i) {
+                if (count($indexes) > 0 && $indexes[0] == $i) {
+                    $match = substr($source, $indexes[0], $word_length);
+                    $result .= "<span class='censor'>{$match}</span>";
+                    $ignore = $word_length - 1;
+                } elseif ($ignore > 0) {
+                    --$ignore;
+                } else {
+                    $result .= $source[$i];
+                }
+            }
+            $source = $result;
+        }
+
+        $replaceDict = Config::get('censor.replace', []);
+        foreach ($replaceDict as $word => $replacement) {
+            $source = str_ireplace($word, $replacement, $source);
+        }
+        return $source;
+    }
+}
diff --git a/app/Http/Controllers/ShoutboxController.php b/app/Http/Controllers/ShoutboxController.php
index 88d29974c3..12346c3988 100755
--- a/app/Http/Controllers/ShoutboxController.php
+++ b/app/Http/Controllers/ShoutboxController.php
@@ -14,6 +14,7 @@
 
 use App\Shoutbox;
 use App\User;
+use App\Helpers\LanguageCensor;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Request;
@@ -153,7 +154,7 @@ public function fetch($after = null)
                        </span>&nbsp;<span class="text-muted"><small><em>' . ($message->created_at->diffForHumans()) . '</em></small></span>
                        </h4>
                        <p class="message-content">
-                       ' . \LaravelEmojiOne::toImage(Shoutbox::getMessageHtml($message->message)) . '
+                       ' . \LaravelEmojiOne::toImage(LanguageCensor::censor(Shoutbox::getMessageHtml($message->message))) . '
                        ' . ($flag ? $delete : "") . '
                        </p></li>';
             }
diff --git a/app/Http/Middleware/LanguageCensor.php b/app/Http/Middleware/LanguageCensor.php
deleted file mode 100644
index 110c939d45..0000000000
--- a/app/Http/Middleware/LanguageCensor.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * NOTICE OF LICENSE
- *
- * UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
- * The details is bundled with this project in the file LICENSE.txt.
- *
- * @project    UNIT3D
- * @license    https://choosealicense.com/licenses/gpl-3.0/  GNU General Public License v3.0
- * @author     HDVinnie
- */
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Config;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-
-/**
- * Class LanguageCensor
- *
- * A middleware that can replace or redact(blur) words on a page.
- *
- */
-class LanguageCensor
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     * @param string|null              $ability
-     * @param string|null              $boundModelName
-     *
-     * @return mixed
-     *
-     * @throws \Symfony\Component\HttpKernel\Exception\HttpException
-     */
-    public function handle($request, Closure $next, $ability = null, $boundModelName = null)
-    {
-        $response = $next($request);
-
-        $content = $response->getContent();
-        $content = $this->censorResponse($content);
-
-        $response->setContent($content);
-
-        return $response;
-    }
-
-    protected function matchWords($string, $word)
-    {
-        $result = [];
-        $length = strlen($word);
-        $pos = stripos($string, $word, 0);
-        while ($pos !== false) {
-            $match = substr($string, $pos, $length);
-            array_push($result, $match);
-            $pos = stripos($string, $word, $pos + $length);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Censor the request response.
-     *
-     * @param $source
-     *
-     * @return mixed
-     */
-    protected function censorResponse($source)
-    {
-        $redactArray = Config::get('censor.redact', []);
-        foreach ($redactArray as $word) {
-            foreach (self::matchWords($source, $word) as $match) {
-                $replacement = "<span class='censor'>{$match}</span>";
-                $source = str_replace($match, $replacement, $source);
-            }
-        }
-
-        $replaceDict = Config::get('censor.replace', []);
-        foreach ($replaceDict as $word => $replacement) {
-            $source = str_ireplace($word, $replacement, $source);
-        }
-        return $source;
-    }
-}
diff --git a/resources/views/blocks/chat.blade.php b/resources/views/blocks/chat.blade.php
index fd6e52999d..a39a954d93 100644
--- a/resources/views/blocks/chat.blade.php
+++ b/resources/views/blocks/chat.blade.php
@@ -16,6 +16,11 @@
           if (in_array(\Auth::user()->id, explode(',', $message->mentions))) {
             $class = 'mentioned';
           }
+
+          $messageHtml = App\Shoutbox::getMessageHtml($message->message);
+          $messageHtml = \LaravelEmojiOne::toImage($messageHtml);
+          $messageHtml = App\Helpers\LanguageCensor::censor($messageHtml);
+
           @endphp
             <li class="list-group-item {{ $class }}">
               @if($message->poster->image != null)
@@ -36,7 +41,7 @@
                   <a title="Delete Shout" href="{{route('shout-delete',['id' => $message->id])}}"><i class="pull-right fa fa-lg fa-times"></i></a>
                 @endif
 
-                @emojione(App\Shoutbox::getMessageHtml($message->message))</p>
+                {!! $messageHtml !!}
             </li>
             @endforeach
         </ul>
diff --git a/routes/web.php b/routes/web.php
index 3fd232fc9e..7166c3f1ea 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -256,7 +256,7 @@
 | ShoutBox Routes Group (when authorized)
 |------------------------------------------
 */
-Route::group(['prefix' => 'shoutbox', 'middleware' => ['auth','censor']], function () {
+Route::group(['prefix' => 'shoutbox', 'middleware' => 'auth'], function () {
     Route::get('/', 'HomeController@home')->name('shoutbox-home');
     Route::get('/messages/{after?}', 'ShoutboxController@fetch')->name('shoutbox-fetch');
     Route::post('/send', 'ShoutboxController@send')->name('shoutbox-send');