diff --git a/tests/test_settings.py b/tests/test_settings.py
index 0a184d5f..bd0d509c 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -11,7 +11,8 @@
 from webssh.policy import load_host_keys
 from webssh.settings import (
     get_host_keys_settings, get_policy_setting, base_dir, get_font_filename,
-    get_ssl_context, get_trusted_downstream, get_origin_setting, print_version
+    get_ssl_context, get_trusted_downstream, get_origin_setting, print_version,
+    check_encoding_setting
 )
 from webssh.utils import UnicodeType
 from webssh._version import __version__
@@ -178,3 +179,9 @@ def test_get_font_setting(self):
         font = 'wrong-name'
         with self.assertRaises(ValueError):
             get_font_filename(font, font_dir)
+
+    def test_check_encoding_setting(self):
+        self.assertIsNone(check_encoding_setting(''))
+        self.assertIsNone(check_encoding_setting('utf-8'))
+        with self.assertRaises(ValueError):
+            check_encoding_setting('unknown-encoding')
diff --git a/webssh/settings.py b/webssh/settings.py
index a86f1ca5..a7b6f944 100644
--- a/webssh/settings.py
+++ b/webssh/settings.py
@@ -193,4 +193,3 @@ def get_font_filename(font, font_dir):
 def check_encoding_setting(encoding):
     if encoding and not is_valid_encoding(encoding):
         raise ValueError('Unknown character encoding.')
-    return encoding