diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD
index 829e96808..6e6ed8258 100644
--- a/main/postmarketos-base-ui/APKBUILD
+++ b/main/postmarketos-base-ui/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=33
+pkgver=34
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
@@ -329,7 +329,7 @@ d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc8435
 d1ddd43489e6016e3ffd716027ed2bae4a2ab5f213118bdbcb96750e267ab7c0367cd0e0e386300aa5550352653144f5caeddd790621fe0879f83ca1995bb65c  rootfs-etc-tinydm.d-env-wayland.d-50-firefox-wayland.sh
 ecaa57d033a119a53a6574c27636b7c89d659d75ea48a973a6a4ff6f90e5d07202529fd489bfc9dfc7430f5b60f40612f6d5c06f7fab47e681b0a3112a874058  rootfs-etc-tinydm.d-env-wayland.d-50-sdl-wayland.sh
 36e0037f6d26a99db7b47831263be610d594e2c1c4a8ee7f6fc8b41092f501d3064d80b80ddf6a82b616bd2da09aa4da896074ad9f7fd53aba7e397da4190d22  rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
-82f6818031021fe777848bcbe328cdb04d508b9c4b19d4c9162bf6f07f62f75d21798f7cf859cb44a3321a375dc9fb5d29402c5624b7bc42e92a698fae482b7c  rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
+802c8ca1603c6bc536f83ea7158f9fb9cf0dd94c59cadab9d059c738ca6bc5c1deb1c982996efd3b1909d01592e5a3e32f005c043e203a83361d3c64994b713b  rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  rootfs-etc-profile.d-qt-mobile-controls.sh
 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  rootfs-etc-profile.d-qt-wayland.sh
 "
diff --git a/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh b/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
index 2070a27f0..63f44ff04 100644
--- a/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
+++ b/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
@@ -13,6 +13,7 @@ con_uuid="83bd1823-feca-4c2b-9205-4b83dc792e1f"
 . /usr/share/misc/source_deviceinfo
 
 usb_network_function="${deviceinfo_usb_network_function:-ncm.usb0}"
+disable_dhcpd="${deviceinfo_disable_dhcpd:-false}"
 usb_network_function_fallback="rndis.usb0"
 if [ -n "$(cat /sys/kernel/config/usb_gadget/g1/UDC)" ]; then
 	interface="$(
@@ -70,8 +71,13 @@ disable_tethering() {
 
 	# Restart unudhcpd and configure it similar to initfs
 	killall unudhcpd || true
-	(unudhcpd -i "$interface" -s "$host_ip" -c "$client_ip") &
-	logger -t nm-tethering "unudhcpd started"
+
+	if [ "$disable_dhcpd" = "true" ]; then
+		logger -t nm-tethering "unudhcpd not restarted because it is disabled"
+	else
+		(unudhcpd -i "$interface" -s "$host_ip" -c "$client_ip") &
+		logger -t nm-tethering "unudhcpd started"
+	fi
 
 	# Reactivate gadget to apply changes
 	reactivate_gadget