diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index a83f166ec52..1ca1b2f0828 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -108,6 +108,6 @@ for setting in config.data.get_settings():
         except:
             value = setting.value
 
-    set_constant(setting.name, setting.value)
+    set_constant(setting.name, value or setting.value)