diff --git a/awx/conf/fields.py b/awx/conf/fields.py
index f8d012a3aa..e68523271b 100644
--- a/awx/conf/fields.py
+++ b/awx/conf/fields.py
@@ -31,6 +31,16 @@ class CharField(CharField):
         return super(CharField, self).to_representation(value)
 
 
+class IntegerField(IntegerField):
+
+    def get_value(self, dictionary):
+        ret = super(IntegerField, self).get_value(dictionary)
+        # Handle UI corner case
+        if ret == '' and self.allow_null and not getattr(self, 'allow_blank', False):
+            return None
+        return ret
+
+
 class StringListField(ListField):
 
     child = CharField()