diff --git a/device/community/soc-qcom/APKBUILD b/device/community/soc-qcom/APKBUILD
index 34a3017f9..21b48a007 100644
--- a/device/community/soc-qcom/APKBUILD
+++ b/device/community/soc-qcom/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=soc-qcom
 pkgdesc="Common package for Qualcomm devices"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -197,5 +197,5 @@ sha512sums="
 f86ebf68bb7e41b531e5cd8fc3e54d8fafad314fb80950277e41004303b3bf75b2ae96f0228bdf4ed67645aee8ceaf247140b4843c66365259d2908b8991b877  gstreamer.conf
 471583b91bc35608cb75d0b3ceb88fa793a4e763ea228703c50ffb1b45c0e9054646c46f710164ec3ef65a882a204fd59546f3a0ebb94b8d6c6f08c4043bcfd3  gstreamer.sh
 99773091f2653f71d4365fdf4cce048a1904cd044a714778567ce0ff6c9c9d76ad537e6e49d1d02bf385f9d35c00794d093ece0fed046072ed5e1ea65baa5201  modem-gnss.initd
-db993ee0d19c6c9d33ee2fdf753fabb4a964598a9660fee931f8a27e0570c2b66065848bd388138b899caa9b22f56937f56a97c592ee19dded8a056c285e6522  modem-gnss.service
+30b16842f585409992ce5a7f0540228655d991e76ba6b86ded65e7442b900ff35d37507913769f1883664aa985d07fe00f9bc22f751eec88d94c180dbe26be5c  modem-gnss.service
 "
diff --git a/device/community/soc-qcom/modem-gnss.service b/device/community/soc-qcom/modem-gnss.service
index 2a2bdb024..1d050d882 100644
--- a/device/community/soc-qcom/modem-gnss.service
+++ b/device/community/soc-qcom/modem-gnss.service
@@ -6,11 +6,18 @@ Description=Qualcomm GNSS Modem Setup
 # a ConditionPathExists= on...
 After=ModemManager.service
 Requires=ModemManager.service
+# Give up after 5 minutes
+StartLimitInterval=300
+StartLimitBurst=10
 
 [Service]
 ExecStart=qmicli -d qrtr://0 --loc-set-engine-lock=mt
 ExecStart=qmicli -d qrtr://0 --loc-set-nmea-types=all
 Type=oneshot
+# Apparently starting after MM isn't always enough time for the location service
+# to be up
+Restart=on-failure
+RestartSec=30
 
 [Install]
 WantedBy=default.target