diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index f1b5b8c82f..1434bba95e 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -1537,7 +1537,7 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
     )
 
     @classmethod
-    def get_setting_object(cls, key, user):
+    def get_setting_object(cls, key, user=None):
         return super().get_setting_object(key, user=user)
 
     def validate_unique(self, exclude=None, **kwargs):
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 9545708811..902f0b26d2 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -329,6 +329,8 @@ def settings_value(key, *args, **kwargs):
     """
 
     if 'user' in kwargs:
+        if not kwargs['user']:
+            return InvenTreeUserSetting.get_setting(key)
         return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
 
     return InvenTreeSetting.get_setting(key)