diff --git a/Gemfile b/Gemfile
index ed20612c0..e8cf35a50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "acts-as-taggable-on", "~> 8.1" # A tagging plugin for Rails applications th
 gem "acts_as_follower", github: "forem/acts_as_follower", branch: "master" # Allow any model to follow any other model
 gem "addressable", "~> 2.8" # A replacement for the URI implementation that is part of Ruby's standard library
 gem "ahoy_email", "~> 2.0.2" # Email analytics for Rails
-gem "ahoy_matey", "~> 3.3" # Tracking analytics for Rails
+gem "ahoy_matey", "~> 4.0" # Tracking analytics for Rails
 gem "ancestry", "~> 4.1" # Ancestry allows the records of a ActiveRecord model to be organized in a tree structure
 gem "blazer", "~> 2.4.3" # Allows admins to query data
 gem "bootsnap", ">= 1.1.0", require: false # Boot large ruby/rails apps faster
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ddfba457..ec9978db1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,10 +79,9 @@ GEM
       addressable (>= 2.3.2)
       nokogiri
       safely_block (>= 0.1.1)
-    ahoy_matey (3.3.0)
-      activesupport (>= 5)
+    ahoy_matey (4.0.0)
+      activesupport (>= 5.2)
       device_detector
-      geocoder (>= 1.4.5)
       safely_block (>= 0.2.1)
     amazing_print (1.3.0)
     ancestry (4.1.0)
@@ -310,7 +309,6 @@ GEM
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     gemoji (4.0.0.rc3)
-    geocoder (1.6.7)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
     gibbon (3.4.0)
@@ -853,7 +851,7 @@ DEPENDENCIES
   acts_as_follower!
   addressable (~> 2.8)
   ahoy_email (~> 2.0.2)
-  ahoy_matey (~> 3.3)
+  ahoy_matey (~> 4.0)
   amazing_print (~> 1.3)
   ancestry (~> 4.1)
   better_errors (~> 2.9)
diff --git a/vendor/cache/ahoy_matey-3.3.0.gem b/vendor/cache/ahoy_matey-3.3.0.gem
deleted file mode 100644
index cf2de9fb3..000000000
Binary files a/vendor/cache/ahoy_matey-3.3.0.gem and /dev/null differ
diff --git a/vendor/cache/ahoy_matey-4.0.0.gem b/vendor/cache/ahoy_matey-4.0.0.gem
new file mode 100644
index 000000000..215d85a8b
Binary files /dev/null and b/vendor/cache/ahoy_matey-4.0.0.gem differ
diff --git a/vendor/cache/geocoder-1.6.7.gem b/vendor/cache/geocoder-1.6.7.gem
deleted file mode 100644
index b073d6777..000000000
Binary files a/vendor/cache/geocoder-1.6.7.gem and /dev/null differ