diff --git a/.travis.yml b/.travis.yml
index c0edd7b5a2..c45e3255fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ branches:
   only:
     - master
     - develop
+    - hotfix
 
 notifications:
   email:
diff --git a/build/entitlements.mac.inherit.plist b/build/entitlements.mas.inherit.plist
similarity index 100%
rename from build/entitlements.mac.inherit.plist
rename to build/entitlements.mas.inherit.plist
diff --git a/build/entitlements.mac.plist b/build/entitlements.mas.plist
similarity index 100%
rename from build/entitlements.mac.plist
rename to build/entitlements.mas.plist
diff --git a/package.json b/package.json
index 50dd26447d..602047bffd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "rocketchat",
   "productName": "Rocket.Chat+",
   "description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "author": "Rocket.Chat Support <support@rocket.chat>",
   "copyright": "© 2017, Rocket.Chat",
   "homepage": "https://rocket.chat",
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0e42f82fcf..73d444d53e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: rocketchat-desktop
-version: 2.10.0
+version: 2.10.1
 summary: Rocket.Chat+
 description: Rocket.Chat Native Cross-Platform Desktop Application via Electron.
 confinement: strict
diff --git a/src/background/windowState.js b/src/background/windowState.js
index 1821fcca33..3b1e5997d2 100644
--- a/src/background/windowState.js
+++ b/src/background/windowState.js
@@ -17,7 +17,7 @@ export default function (name, defaults) {
 
     try {
         const loadedState = userDataDir.read(stateStoreFile, 'json');
-        if (loadedState != null) {
+        if (loadedState) {
             state = loadedState;
         }
     } catch (err) {
@@ -41,10 +41,10 @@ export default function (name, defaults) {
     };
 
     return {
-        get x () { return Math.floor(state.x); },
-        get y () { return Math.floor(state.y); },
-        get width () { return Math.floor(state.width); },
-        get height () { return Math.floor(state.height); },
+        get x () { return state.x && Math.floor(state.x); },
+        get y () { return state.y && Math.floor(state.y); },
+        get width () { return state.width && Math.floor(state.width); },
+        get height () { return state.height && Math.floor(state.height); },
         get isMaximized () { return state.isMaximized; },
         get isMinimized () { return state.isMinimized; },
         get isHidden () { return state.isHidden; },