diff --git a/package.json b/package.json
index 20d2fd428..c16137e55 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "emotion": "^8.0.10",
     "emotion-server": "^8.0.10",
     "get-port": "^3.2.0",
-    "grid-emotion": "^2.1.0",
+    "grid-emotion": "^3.1.0",
     "isomorphic-unfetch": "2.0.0",
     "lodash.take": "^4.1.1",
     "marked": "^0.3.6",
diff --git a/yarn.lock b/yarn.lock
index ae75e2fe8..b0252b5a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1570,6 +1570,14 @@ clean-regexp@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+clean-tag@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clean-tag/-/clean-tag-1.0.3.tgz#26222fb77e4fa7b5a63734b4966ef44a2f148db2"
+  dependencies:
+    html-tags "^2.0.0"
+    react ">=16.0.0"
+    styled-system ">=1.1 || >=2.0"
+
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
@@ -3558,13 +3566,13 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-grid-emotion@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/grid-emotion/-/grid-emotion-2.1.0.tgz#5e62a8468f9cff4e50680afb9be9322a68336385"
+grid-emotion@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/grid-emotion/-/grid-emotion-3.2.0.tgz#a6f252a521a0f0eee6935d01d3f5933de91dae52"
   dependencies:
+    clean-tag "^1.0.3"
     prop-types "^15.6.0"
-    styled-system "^1.0.2"
-    tag-hoc "^1.0.0"
+    styled-system "^2.1.0"
 
 growly@^1.3.0:
   version "1.3.0"
@@ -3770,6 +3778,10 @@ html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
+html-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
+
 htmlescape@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
@@ -6704,7 +6716,7 @@ react-test-renderer@16.2.0, react-test-renderer@^16.0.0-0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react@^16.0.0:
+react@>=16.0.0, react@^16.0.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
   dependencies:
@@ -7690,9 +7702,9 @@ styled-jsx@2.2.1:
     stylis "3.4.5"
     stylis-rule-sheet "0.0.7"
 
-styled-system@^1.0.2:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-1.0.8.tgz#a5a08ab26a8cc27e7a22e743d623211b82482b5e"
+"styled-system@>=1.1 || >=2.0", styled-system@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-2.1.0.tgz#dd5a8f863c962e0aaf054443f05b6d7aa0b4dc31"
   dependencies:
     prop-types "^15.6.0"
 
@@ -7763,10 +7775,6 @@ table@^4.0.1:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
-tag-hoc@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tag-hoc/-/tag-hoc-1.0.0.tgz#36ddc5f8831c40926ea520743cbddcc34f3c3ed9"
-
 tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"