diff --git a/client/webpack.config.js b/client/webpack.config.js
index 4bfc870..20d10d3 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -235,7 +235,8 @@ function getConfig(env) {
       extensions: [".ts", ".tsx", ".js", ".json", ".scss"],
       alias: {
         "@client": paths.clientDir,
-        "@common": paths.commonDir
+        "@common": paths.commonDir,
+        "react-dom": isDev ? "@hot-loader/react-dom" : "react-dom"
       }
     },
     module: { rules },
@@ -257,7 +258,7 @@ function getConfig(env) {
           target: paths.publicUrl
         }
       ]
-    }
+    },
   };
 }
 
diff --git a/package.json b/package.json
index 1b7b7a7..1febb01 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,6 @@
     "@oclif/command": "^1.5.0",
     "@oclif/config": "^1.7.4",
     "@oclif/plugin-help": "^2.1.1",
-    "@types/pino-http": "^4.0.2",
-    "@types/split2": "^2.1.6",
     "bcrypt": "^3.0.0",
     "body-parser": "^1.18.3",
     "chalk": "^2.4.1",
@@ -75,6 +73,7 @@
     "ws": "^7.1.1"
   },
   "devDependencies": {
+    "@hot-loader/react-dom": "^16.8.6",
     "@types/async": "^3.0.0",
     "@types/bcrypt": "^3.0.0",
     "@types/classnames": "^2.2.6",
@@ -86,6 +85,7 @@
     "@types/node": "^11.11.3",
     "@types/object-assign": "^4.0.30",
     "@types/pino": "^5.20.0",
+    "@types/pino-http": "^4.0.2",
     "@types/prop-types": "^15.5.5",
     "@types/pump": "^1.0.1",
     "@types/query-string": "^6.1.0",
@@ -94,6 +94,7 @@
     "@types/react-hot-loader": "^4.1.0",
     "@types/react-router-dom": "^4.3.0",
     "@types/react-sortable-hoc": "^0.6.4",
+    "@types/split2": "^2.1.6",
     "@types/through2": "^2.0.33",
     "@types/webpack-env": "^1.13.6",
     "@types/ws": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index d0ca2fe..463d5b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,6 +56,16 @@
     reflect-metadata "^0.1.12"
     tslib "^1.8.1"
 
+"@hot-loader/react-dom@^16.8.6":
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/@hot-loader/react-dom/-/react-dom-16.8.6.tgz#7923ba27db1563a7cc48d4e0b2879a140df461ea"
+  integrity sha512-+JHIYh33FVglJYZAUtRjfT5qZoT2mueJGNzU5weS2CVw26BgbxGKSujlJhO85BaRbg8sqNWyW1hYBILgK3ZCgA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.6"
+
 "@most/multicast@^1.2.5":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@most/multicast/-/multicast-1.3.0.tgz#e01574840df634478ac3fabd164c6e830fb3b966"
@@ -7181,7 +7191,7 @@ react-sortable-hoc@^1.9.1:
     invariant "^2.2.4"
     prop-types "^15.5.7"
 
-react@^16.6.3:
+react@^16.8.0:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
   integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==