diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files
index 248a2c753..00d3cdde6 100644
--- a/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/core/130/filelists/files
@@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
 etc/collectd.conf
 etc/logrotate.conf
+etc/rc.d/init.d/collectd
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/suricata
diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index cdb8693ae..5233525f0 100644
--- a/src/initscripts/system/collectd
+++ b/src/initscripts/system/collectd
@@ -35,6 +35,11 @@ case "$1" in
 			touch /etc/sysconfig/lm_sensors
 		fi
 
+		# Do not search for sensors when running on AWS
+		if [ -e "/var/run/aws-instance-id" ]; then
+			touch /etc/sysconfig/lm_sensors
+		fi
+
 		# At first run search for sensors with sensors-detect
 		if [ ! -e /etc/sysconfig/lm_sensors ]; then
 			boot_mesg "Searching for Sensors..."