diff --git a/InvenTree/InvenTree/management/commands/clean_settings.py b/InvenTree/InvenTree/management/commands/clean_settings.py
new file mode 100644
index 0000000000..e0fd09e6c7
--- /dev/null
+++ b/InvenTree/InvenTree/management/commands/clean_settings.py
@@ -0,0 +1,38 @@
+"""
+Custom management command to cleanup old settings that are not defined anymore
+"""
+
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    """
+    Cleanup old (undefined) settings in the database
+    """
+
+    def handle(self, *args, **kwargs):
+
+        print("Collecting settings")
+        from common.models import InvenTreeSetting, InvenTreeUserSetting
+
+        # general settings
+        db_settings = InvenTreeSetting.objects.all()
+        model_settings = InvenTreeSetting.GLOBAL_SETTINGS
+
+        # check if key exist and delete if not
+        for setting in db_settings:
+            if setting.key not in model_settings:
+                setting.delete()
+                print(f"deleted setting '{setting.key}'")
+
+        # user settings
+        db_settings = InvenTreeUserSetting.objects.all()
+        model_settings = InvenTreeUserSetting.GLOBAL_SETTINGS
+
+        # check if key exist and delete if not
+        for setting in db_settings:
+            if setting.key not in model_settings:
+                setting.delete()
+                print(f"deleted user setting '{setting.key}'")
+
+        print("checked all settings")
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 54dc21c1b5..5d75a4dd74 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -20,6 +20,7 @@ from djmoney.contrib.exchange.models import convert_money
 from djmoney.contrib.exchange.exceptions import MissingRate
 
 from django.utils.translation import ugettext_lazy as _
+from django.utils.html import format_html
 from django.core.validators import MinValueValidator, URLValidator
 from django.core.exceptions import ValidationError
 
@@ -58,12 +59,13 @@ class BaseInvenTreeSetting(models.Model):
 
         # Query the database
         for setting in results:
-            settings.append({
-                "key": setting.key.upper(),
-                "value": setting.value
-            })
+            if setting.key:
+                settings.append({
+                    "key": setting.key.upper(),
+                    "value": setting.value
+                })
 
-            keys.add(setting.key.upper())
+                keys.add(setting.key.upper())
 
         # Specify any "default" values which are not in the database
         for key in cls.GLOBAL_SETTINGS.keys():
@@ -90,10 +92,10 @@ class BaseInvenTreeSetting(models.Model):
             # Numerical values remain the same
             elif cls.validator_is_int(validator):
                 pass
-                
+
             # Wrap strings with quotes
             else:
-                value = f"'{value}'"
+                value = format_html("'{}'", value)
 
             setting["value"] = value
 
diff --git a/InvenTree/templates/js/dynamic/settings.js b/InvenTree/templates/js/dynamic/settings.js
index 4cc824ed6c..ad4e297c4a 100644
--- a/InvenTree/templates/js/dynamic/settings.js
+++ b/InvenTree/templates/js/dynamic/settings.js
@@ -6,12 +6,12 @@
 
 var user_settings = {
     {% for setting in USER_SETTINGS %}
-    {{ setting.key }}: {{ setting.value|safe }},
+    {{ setting.key }}: {{ setting.value }},
     {% endfor %}
 };
 
 var global_settings = {
     {% for setting in GLOBAL_SETTINGS %}
-    {{ setting.key }}: {{ setting.value|safe }},
+    {{ setting.key }}: {{ setting.value }},
     {% endfor %}
 };
\ No newline at end of file
diff --git a/tasks.py b/tasks.py
index b78a135b08..a9168f4649 100644
--- a/tasks.py
+++ b/tasks.py
@@ -137,6 +137,14 @@ def rebuild(c):
 
     manage(c, "rebuild_models")
 
+@task
+def clean_settings(c):
+    """
+    Clean the setting tables of old settings
+    """
+
+    manage(c, "clean_settings")
+
 @task
 def migrate(c):
     """
@@ -167,7 +175,7 @@ def static(c):
     manage(c, "collectstatic --no-input")
 
 
-@task(pre=[install, migrate, static])
+@task(pre=[install, migrate, static, clean_settings])
 def update(c):
     """
     Update InvenTree installation.