diff --git a/server/lib/cordova.coffee b/server/lib/cordova.coffee
index 67ceb00cb0b..ce52851e6f1 100644
--- a/server/lib/cordova.coffee
+++ b/server/lib/cordova.coffee
@@ -74,6 +74,12 @@ configurePush = ->
 					certData: RocketChat.settings.get 'Push_apn_dev_cert'
 					gateway: 'gateway.sandbox.push.apple.com'
 
+		if not apn.keyData? or apn.keyData.trim() is '' or not apn.keyData? or apn.keyData.trim() is ''
+			apn = undefined
+
+		if not gcm.apiKey? or gcm.apiKey.trim() is '' or not gcm.projectNumber? or gcm.projectNumber.trim() is ''
+			gcm = undefined
+
 		Push.Configure
 			apn: apn
 			gcm: gcm