diff --git a/app/cloud/server/functions/connectWorkspace.js b/app/cloud/server/functions/connectWorkspace.js
index 17872bbce58..6e428803dc0 100644
--- a/app/cloud/server/functions/connectWorkspace.js
+++ b/app/cloud/server/functions/connectWorkspace.js
@@ -13,6 +13,12 @@ export function connectWorkspace(token) {
 		Settings.updateValueById('Register_Server', true);
 	}
 
+	// shouldn't get here due to checking this on the method
+	// but this is just to double check
+	if (!token) {
+		return new Error('Invalid token; the registration token is required.');
+	}
+
 	const redirectUri = getRedirectUri();
 
 	const regInfo = {
diff --git a/app/cloud/server/methods.js b/app/cloud/server/methods.js
index 7e64e5d889d..7723566601f 100644
--- a/app/cloud/server/methods.js
+++ b/app/cloud/server/methods.js
@@ -70,6 +70,10 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'cloud:connectServer' });
 		}
 
+		if (!token) {
+			throw new Meteor.Error('error-invalid-payload', 'Token is required.', { method: 'cloud:connectServer' });
+		}
+
 		return connectWorkspace(token);
 	},
 	'cloud:disconnectWorkspace'() {