diff --git a/awx/conf/registry.py b/awx/conf/registry.py
index 2534e238c0..5a4334c181 100644
--- a/awx/conf/registry.py
+++ b/awx/conf/registry.py
@@ -127,7 +127,7 @@ class SettingsRegistry(object):
                 field_instance.default = original_field_instance.to_representation(getattr(settings, setting))
             except:
                 logger.warning('Unable to retrieve default value for user setting "%s".', setting, exc_info=True)
-        elif not field_instance.read_only or field_instance.default is empty:
+        elif not field_instance.read_only or field_instance.default is empty or not field_instance.default:
             try:
                 field_instance.default = original_field_instance.to_representation(settings._awx_conf_settings._get_default(setting))
             except AttributeError: