diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 161356302fd7..67d2ffca77a2 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -163,6 +163,11 @@ class AccountController extends BaseController
     public function update(UpdateAccountRequest $request, Account $account)
     {
 
+        $fi = new \FilesystemIterator(public_path('react'), \FilesystemIterator::SKIP_DOTS);
+
+        if(iterator_count($fi) < 30)
+            return response()->json(['message' => 'React App Not Installed, Please install the React app before attempting to switch.'], 400);
+
         $account->fill($request->all());
         $account->save();
 
diff --git a/resources/views/react/index.blade.php b/resources/views/react/index.blade.php
index d490313bc340..a70107a22ea6 100644
--- a/resources/views/react/index.blade.php
+++ b/resources/views/react/index.blade.php
@@ -17,4 +17,15 @@
   
 </body>
 
+<!--
+
+If you are reading this, there is a fair change that the react application has not loaded for you. There are a couple of solutions:
+
+1. Download the release file from https://github.com/invoiceninja/invoiceninja and overwrite your current installation.
+2. Switch back to the Flutter application by editing the database, you can do this with the following SQL
+
+UPDATE accounts SET
+set_react_as_default_ap = 0;
+
+-->
 </html>