diff --git a/Gemfile b/Gemfile
index 1cf7ba826..60c838d1e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'lograge', '~> 0.11' # Less verbose Rails log in production
 gem 'puma', '~> 3.12' # App server
 
 # Analytics
-gem 'ahoy_matey', '~> 1.6'
+gem 'ahoy_matey', '~> 3.0'
 
 # STORAGE
 gem 'aws-sdk-s3', '~> 1.41' # Upload images to AWS S3
diff --git a/Gemfile.lock b/Gemfile.lock
index 1183a5cc9..66be46fe1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,19 +80,13 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ahoy_matey (1.6.1)
-      addressable
-      browser (~> 2.0)
-      geocoder
-      rack-attack (< 6)
-      railties
-      referer-parser (>= 0.3.0)
-      request_store
-      safely_block (>= 0.1.1)
-      user_agent_parser
-      uuidtools
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ahoy_matey (3.0.1)
+      activesupport (>= 5)
+      device_detector
+      geocoder (>= 1.4.5)
+      safely_block (>= 0.2.1)
     airbrake (9.3.0)
       airbrake-ruby (~> 4.5)
     airbrake-ruby (4.5.0)
@@ -146,7 +140,6 @@ GEM
       safely_block (>= 0.1.1)
     bootsnap (1.4.4)
       msgpack (~> 1.0)
-    browser (2.5.2)
     builder (3.2.3)
     bullet (6.0.2)
       activesupport (>= 3.0.0)
@@ -192,6 +185,7 @@ GEM
       rack (>= 1)
       rake (> 10, < 13)
       thor (~> 0.19)
+    device_detector (1.0.2)
     diff-lcs (1.3)
     docile (1.3.0)
     domain_name (0.5.20180417)
@@ -229,7 +223,7 @@ GEM
       dry-types (~> 0.13.1)
     email_reply_parser (0.5.9)
     errbase (0.1.1)
-    erubi (1.8.0)
+    erubi (1.9.0)
     excon (0.62.0)
     execjs (2.7.0)
     factory_bot (4.11.1)
@@ -533,7 +527,7 @@ GEM
     mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -558,7 +552,7 @@ GEM
       ast (~> 2.4.0)
     personnummer (0.1.0)
     pg (1.1.4)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     puma (3.12.1)
     pundit (2.0.1)
       activesupport (>= 3.0.0)
@@ -591,7 +585,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
@@ -603,7 +597,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     ransack (2.1.1)
       actionpack (>= 5.0)
       activerecord (>= 5.0)
@@ -628,7 +622,6 @@ GEM
       redis-store (>= 1.3, < 2)
     redis-store (1.5.0)
       redis (>= 2.2, < 5)
-    referer-parser (0.3.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -677,8 +670,8 @@ GEM
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    safely_block (0.2.1)
-      errbase
+    safely_block (0.2.2)
+      errbase (>= 0.1.1)
     sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -742,8 +735,6 @@ GEM
     unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     uniform_notifier (1.12.1)
-    user_agent_parser (2.4.1)
-    uuidtools (2.1.5)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -771,7 +762,7 @@ DEPENDENCIES
   active_admin_theme (~> 1.0)
   active_model_serializers (~> 0.10)
   activeadmin (~> 1.4.3, >= 1.4.3)
-  ahoy_matey (~> 1.6)
+  ahoy_matey (~> 3.0)
   airbrake (~> 9.3)
   ancestry (~> 3.0)
   annotate (~> 2.7)