diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index b524033b70..04b3b47e43 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -27,7 +27,6 @@ import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
 import MatrixActionCreators from './actions/MatrixActionCreators';
 import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
-import Tinter from "./Tinter";
 
 interface MatrixClientCreds {
     homeserverUrl: string,
@@ -134,9 +133,6 @@ class MatrixClientPeg {
             }
         }
 
-        const color_scheme = SettingsStore.getValue("roomColor");
-        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
-
         // Connect the matrix client to the dispatcher
         MatrixActionCreators.start(this.matrixClient);
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index db5e898946..f385aacd40 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1403,6 +1403,11 @@ export default React.createClass({
                     break;
             }
         });
+
+        // Fire the tinter right on startup to ensure the default theme is applied
+        // A later sync can/will correct the tint to be the right value for the user
+        const color_scheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
     },
 
     /**