diff --git a/Gemfile b/Gemfile
index 30c060666..fdf24d76f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,9 +84,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
 
 gem 'omniauth-oauth2', require: false
 
-# see: https://github.com/zquestz/omniauth-google-oauth2/pull/193#issuecomment-170447701
-# https://meta.discourse.org/t/google-authentication-bug-on-discourse/37734
-gem 'omniauth-google-oauth2', '0.2.5'
+gem 'omniauth-google-oauth2'
 gem 'oj'
 gem 'pg'
 gem 'pry-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4625568ae..f480eb6eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.4.0)
     annotate (2.7.0)
       activerecord (>= 3.2, < 6.0)
       rake (~> 10.4)
@@ -194,9 +195,12 @@ GEM
     omniauth-github-discourse (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.2.5)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.3.0)
+      addressable (~> 2.3)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -444,7 +448,7 @@ DEPENDENCIES
   omniauth
   omniauth-facebook
   omniauth-github-discourse
-  omniauth-google-oauth2 (= 0.2.5)
+  omniauth-google-oauth2
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter