diff --git a/Gemfile b/Gemfile
index a69182874..16cb97d83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-gem "react_on_rails", "6.9.3"
+gem "react_on_rails", "7.0.0"
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # mini_racer is probably faster than therubyracer
diff --git a/Gemfile.lock b/Gemfile.lock
index 71ae9755a..96184b75a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,7 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rdoc (4.3.0)
-    react_on_rails (6.9.3)
+    react_on_rails (7.0.0)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -330,7 +330,7 @@ DEPENDENCIES
   rails
   rails-html-sanitizer
   rainbow
-  react_on_rails (= 6.9.3)
+  react_on_rails (= 7.0.0)
   redis
   rspec-rails (~> 3)
   rspec-retry
diff --git a/client/package.json b/client/package.json
index 5697949df..c6a8246ba 100644
--- a/client/package.json
+++ b/client/package.json
@@ -78,7 +78,7 @@
     "react-bootstrap": "^0.30.8",
     "react-dom": "^15.4.1",
     "react-intl": "^2.2.2",
-    "react-on-rails": "^6.9.3",
+    "react-on-rails": "^7.0.0",
     "react-redux": "^4.4.6",
     "react-router": "^3.0.0",
     "react-router-redux": "^4.0.7",
diff --git a/client/yarn.lock b/client/yarn.lock
index d9d60589b..123d15dd4 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4653,9 +4653,9 @@ react-intl@^2.2.2:
     intl-relativeformat "^1.3.0"
     invariant "^2.1.1"
 
-react-on-rails@^6.9.3:
-  version "6.9.3"
-  resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-6.9.3.tgz#71aa3c6d0995e387e2c406359f7988991ac4180e"
+react-on-rails@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-7.0.0.tgz#ff7f12fb918b14ef932f77a71532b0f9eceb7955"
 
 react-overlays@^0.6.12:
   version "0.6.12"
@@ -5361,7 +5361,7 @@ style-loader@^0.16.1:
   dependencies:
     loader-utils "^1.0.2"
 
-supports-color@3.1.2, supports-color@^3.1.1:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -5371,7 +5371,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies: