diff --git a/config/boards/khadas-edge.conf b/config/boards/khadas-edge.conf
index f2048010cb..76955e63b8 100644
--- a/config/boards/khadas-edge.conf
+++ b/config/boards/khadas-edge.conf
@@ -5,3 +5,4 @@ BOOTCONFIG="khadas-edge-v-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
+ASOUND_STATE="asound.state.rk3399"
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
index 00b0f47ece..975bafef2a 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -125,7 +125,7 @@ case "$1" in
 	esac
 
 	# varios temporary hardware workarounds
-	[[ $LINUXFAMILY == rk3399 || $LINUXFAMILY == rockchip64 ]] && [[ $BOARD != helios64 ]] && set_fixed_mac
+	[[ $LINUXFAMILY == rk3399 || $LINUXFAMILY == rockchip64 ]] && [[ $BOARD != helios64 && $BOARD != khadas-edge ]] && set_fixed_mac
 	[[ $BRANCH == dev && $LINUXFAMILY == rockchip ]] && set_fixed_mac
 	[[ $BRANCH == current && $LINUXFAMILY == odroidc1 ]] && set_fixed_mac
 	[[ $LINUXFAMILY == meson64 ]] && set_fixed_mac