diff --git a/desktop/app/src/init.tsx b/desktop/app/src/init.tsx
index 98d93cfb6..e0da6e1da 100644
--- a/desktop/app/src/init.tsx
+++ b/desktop/app/src/init.tsx
@@ -106,11 +106,9 @@ function init() {
     store,
     {name: 'loadTheme', fireImmediately: true, throttleMs: 500},
     (state) =>
-      state.settingsState.enableSandy
-        ? state.settingsState.darkMode
-          ? 'themes/dark'
-          : 'themes/light'
-        : 'none',
+      state.settingsState.enableSandy && state.settingsState.darkMode
+        ? 'themes/dark'
+        : 'themes/light',
     (theme) => {
       (document.getElementById(
         'flipper-theme-import',
diff --git a/desktop/static/empty.css b/desktop/static/empty.css
deleted file mode 100644
index 5e3768f9d..000000000
--- a/desktop/static/empty.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-/*
- used as theme in case Sandy is not enabled
-*/
diff --git a/desktop/static/index.dev.html b/desktop/static/index.dev.html
index c18c8e5c6..2b3e481b8 100644
--- a/desktop/static/index.dev.html
+++ b/desktop/static/index.dev.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style.css">
-    <link id="flipper-theme-import" rel="stylesheet" href="empty.css">
+    <link id="flipper-theme-import" rel="stylesheet" href="themes/light.css">
     <link rel="stylesheet" href="graphiql/graphiql.css">
     <link rel="stylesheet" href="vis/vis.min.css">
     <title>Flipper</title>
diff --git a/desktop/static/index.html b/desktop/static/index.html
index 9eb3dd92e..0508ff97e 100644
--- a/desktop/static/index.html
+++ b/desktop/static/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style.css">
-    <link id="flipper-theme-import" rel="stylesheet" href="empty.css">
+    <link id="flipper-theme-import" rel="stylesheet" href="themes/light.css">
     <link rel="stylesheet" href="graphiql/graphiql.css">
     <link rel="stylesheet" href="vis/vis.min.css">
     <title>Flipper</title>