diff --git a/daemon/main.c b/daemon/main.c
index d9abdfdf9..05ac50718 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -44,7 +44,6 @@
 #include "rtcp.h"
 #include "iptables.h"
 #include "statistics.h"
-#include "graphite.h"
 #include "codeclib.h"
 #include "load.h"
 #include "ssllib.h"
@@ -1303,7 +1302,7 @@ int main(int argc, char **argv) {
 
 	do_redis_restore();
 
-	if (!is_addr_unspecified(&rtpe_config.graphite_ep.address))
+	if (graphite_is_enabled())
 		thread_create_detach(graphite_loop, NULL, "graphite");
 
 #ifdef HAVE_MQTT
diff --git a/include/graphite.h b/include/graphite.h
index 2f0ad4633..06aded203 100644
--- a/include/graphite.h
+++ b/include/graphite.h
@@ -38,4 +38,9 @@ void set_graphite_interval_tv(struct timeval *tv);
 
 GString *print_graphite_data(void);
 
+
+INLINE bool graphite_is_enabled(void) {
+	return !is_addr_unspecified(&rtpe_config.graphite_ep.address);
+}
+
 #endif /* GRAPHITE_H_ */