diff --git a/units/systemd-report-basic@.service.in b/units/systemd-report-basic@.service.in
index a8a3b76e865..043324b5c39 100644
--- a/units/systemd-report-basic@.service.in
+++ b/units/systemd-report-basic@.service.in
@@ -9,6 +9,10 @@
 [Unit]
 Description=Report System Basic Facts
 
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
+
 [Service]
 CapabilityBoundingSet=
 DeviceAllow=