diff --git a/.ruby-version b/.ruby-version
index 00355e29d1..79a614418f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.7
+2.4.4
diff --git a/Gemfile b/Gemfile
index 5d2ed698d5..a0d551b96c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby "2.3.7"
+ruby "2.4.4"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe21bc9972..f553d47627 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -836,7 +836,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 2.3.7p456
+   ruby 2.4.4p296
 
 BUNDLED WITH
    1.17.3
diff --git a/app/models/spree/preferences/preferable.rb b/app/models/spree/preferences/preferable.rb
index 91a14256af..34cf69e193 100644
--- a/app/models/spree/preferences/preferable.rb
+++ b/app/models/spree/preferences/preferable.rb
@@ -115,6 +115,7 @@ module Spree
         when :password
           value.to_s
         when :decimal
+          value = 0 if value.blank?
           BigDecimal(value.to_s).round(2, BigDecimal::ROUND_HALF_UP)
         when :integer
           value.to_i