diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 97e18dbdc..07caf06d5 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -5,13 +5,13 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "yarn clean && yarn compile && pushd ../web && yarn build && popd && yarn build:electron",
-    "build:electron": "NODE_ENV=production electron-builder -mw",
+    "build:electron": "electron-builder -mw",
     "compile": "tsc -b",
     "clean": "rm -rf build && rm -rf dist",
     "format": "prettier --write '{.,src/**}/*.{js,jsx,ts,tsx}'",
     "lint": "tslint -p .",
     "predeploy": "yarn run build",
-    "start": "NODE_ENV=development nodemon --watch dist/*.js --watch assets --exec \"electron .\"",
+    "start": "nodemon --watch dist/*.js --watch assets --exec \"electron .\"",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "build": {
diff --git a/packages/desktop/src/index.ts b/packages/desktop/src/index.ts
index 12190347e..7b774d5be 100644
--- a/packages/desktop/src/index.ts
+++ b/packages/desktop/src/index.ts
@@ -10,7 +10,7 @@ import {
 } from 'electron'
 import path from 'path'
 
-const __DEV__ = process.env.NODE_ENV === 'development'
+import { __DEV__ } from './libs/electron-is-dev'
 
 let mainWindow: Electron.BrowserWindow
 let tray: Electron.Tray | null = null
diff --git a/packages/desktop/src/libs/electron-is-dev/index.ts b/packages/desktop/src/libs/electron-is-dev/index.ts
new file mode 100644
index 000000000..9267d0e3a
--- /dev/null
+++ b/packages/desktop/src/libs/electron-is-dev/index.ts
@@ -0,0 +1,12 @@
+// Source: https://github.com/sindresorhus/electron-is-dev
+
+import electron from 'electron'
+
+const app = electron.app || electron.remote.app
+
+const isEnvSet = 'ELECTRON_IS_DEV' in process.env
+const getFromEnv =
+  !!process.env.ELECTRON_IS_DEV &&
+  parseInt(process.env.ELECTRON_IS_DEV, 10) === 1
+
+export const __DEV__ = isEnvSet ? getFromEnv : !app.isPackaged