diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab200cd..2c3f0f7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ _This release is scheduled to be released on 2022-01-01._
 - Fixed electron tests with retry.
 - Fixed Calendar recurring cross timezone error (add/subtract a day, not just offset hours) (#2632)
 - Fixed Calendar showEnd and Full Date overlay (#2629)
+- Fix useHttps for full version (#2749)
 
 ## [2.17.1] - 2021-10-01
 
diff --git a/js/electron.js b/js/electron.js
index 2c44ab02..509b5474 100644
--- a/js/electron.js
+++ b/js/electron.js
@@ -53,7 +53,7 @@ function createWindow() {
 	// If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost
 
 	let prefix;
-	if (config["tls"] !== null && config["tls"]) {
+	if ((config["tls"] !== null && config["tls"]) || config.useHttps) {
 		prefix = "https://";
 	} else {
 		prefix = "http://";
@@ -140,6 +140,13 @@ app.on("before-quit", (event) => {
 	process.exit(0);
 });
 
+/* handle errors from self signed certificates */
+
+app.on("certificate-error", (event, webContents, url, error, certificate, callback) => {
+	event.preventDefault();
+	callback(true);
+});
+
 // Start the core application if server is run on localhost
 // This starts all node helpers and starts the webserver.
 if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) {