diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 25d5b333f..7e233a5ff 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -309,8 +309,7 @@ export class DomainPopupView extends AbstractViewPopup {
 	autoconfig() {
 		let domain = this.name();
 		Remote.request('AdminDomainAutoconfig', (iError, oData) => {
-			console.dir({iError, oData});
-			if (!iError) {
+			if (oData?.Result?.config) {
 				let server = oData.Result.config.incomingServer[0];
 				this.imapHost(server.hostname);
 				this.imapPort(server.port);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
index c07a78c56..db076c087 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
@@ -83,7 +83,7 @@ abstract class Autoconfig
 		$oCache = \RainLoop\Api::Actions()->Cacher();
 		$list = $oCache->Get('public_suffix_list') ?: null;
 		if ($list) {
-			$list = \json_decode($list);
+			$list = \json_decode($list, true);
 			if ($list[1] < \time()) {
 				$list = null;
 			} else {