diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3edefa1..c05dd3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@
 1. Deprecated D-Bus interface `xyz.openbmc_project.console` is no longer used.
 2. config: Drop support for the `socket-id` configuration key
 
+### Fixed
+
+1. console-server: Fix configuration of lpc_address and sirq sysfs attributes
+
 ## [1.1.0] - 2023-06-07
 
 ### Added
diff --git a/console-server.c b/console-server.c
index 5715589..1337be0 100644
--- a/console-server.c
+++ b/console-server.c
@@ -150,14 +150,24 @@
 		goto out_free;
 	}
 
-	/* Arbitrarily pick an attribute to differentiate UART vs VUART */
-	rc = asprintf(&tty_vuart_lpc_addr, "%s/lpc_address", tty_sysfs_devnode);
-	if (rc < 0) {
-		goto out_free;
-	}
+	// Default to non-VUART
+	console->tty.type = TTY_DEVICE_UART;
 
-	rc = access(tty_vuart_lpc_addr, F_OK);
-	console->tty.type = (!rc) ? TTY_DEVICE_VUART : TTY_DEVICE_UART;
+	/* Arbitrarily pick an attribute to differentiate UART vs VUART */
+	if (tty_sysfs_devnode) {
+		rc = asprintf(&tty_vuart_lpc_addr, "%s/lpc_address",
+			      tty_sysfs_devnode);
+		if (rc < 0) {
+			goto out_free;
+		}
+
+		rc = access(tty_vuart_lpc_addr, F_OK);
+		if (!rc) {
+			console->tty.type = TTY_DEVICE_VUART;
+			console->tty.vuart.sysfs_devnode =
+				strdup(tty_sysfs_devnode);
+		}
+	}
 
 	rc = 0;