diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 5d78c224df3..95e87d3b40c 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -151,6 +151,10 @@ module SiteSettingExtension
       val = val.to_i
     end
 
+    if type == Types::Null && val != ''
+      type = get_data_type(val)
+    end
+
     if setting
       setting.value = val
       setting.data_type = type