diff --git a/content/opt/setup/graphite b/content/opt/setup/graphite
index 7bfebea..0af4258 100755
--- a/content/opt/setup/graphite
+++ b/content/opt/setup/graphite
@@ -21,8 +21,5 @@ if [ "${ICINGA2_FEATURE_GRAPHITE}" == "true" ] || [ "${ICINGA2_FEATURE_GRAPHITE}
 
 else
 	# Actively disable graphite, to not hit any weird bugs
-	# Currently icinga2 gives weird error-messages when disabling a disabled feature
-	# https://dev.icinga.com/issues/13903
-	[ -e /etc/icinga2/features-enabled/graphite.conf ] && \
 	icinga2 feature disable graphite
 fi
diff --git a/content/opt/setup/icingaweb2-director b/content/opt/setup/icingaweb2-director
index 2b42a72..47eab4f 100755
--- a/content/opt/setup/icingaweb2-director
+++ b/content/opt/setup/icingaweb2-director
@@ -30,6 +30,5 @@ if [ "${ICINGA2_FEATURE_DIRECTOR}" == "true" ] || [ "${ICINGA2_FEATURE_DIRECTOR}
 else
 	[ ! -L /etc/icinga2/conf.d/api-user.conf ] && \
 	rm /etc/icinga2/conf.d/api-user.conf
-	[ -e /etc/icingaweb2/enabledModules/director ] && \
 	icingacli module disable director
 fi
diff --git a/content/opt/setup/icingaweb2-graphite b/content/opt/setup/icingaweb2-graphite
index 46bc867..5f3c6b1 100755
--- a/content/opt/setup/icingaweb2-graphite
+++ b/content/opt/setup/icingaweb2-graphite
@@ -11,7 +11,5 @@ if [ "${ICINGA2_FEATURE_GRAPHITE}" == "true" ] || [ "${ICINGA2_FEATURE_GRAPHITE}
 
 else
 	# Actively disable graphite, to not hit any weird bugs
-	# Currently icingacli gives weird error-messages when disabling a disabled feature
-	[ -e /etc/icingaweb2/enabledModules/graphite ] && \
 	icingacli module disable graphite
 fi