diff --git a/src/apps/relay/CMakeLists.txt b/src/apps/relay/CMakeLists.txt
index 09026ad8..e05de216 100644
--- a/src/apps/relay/CMakeLists.txt
+++ b/src/apps/relay/CMakeLists.txt
@@ -22,6 +22,7 @@ set(HEADER_FILES
     turn_ports.h
     userdb.h
     dbdrivers/dbdriver.h
+    prom_server.h
     )
 
 set(SOURCE_FILES
@@ -37,6 +38,7 @@ set(SOURCE_FILES
     acme.c
     userdb.c
     dbdrivers/dbdriver.c
+    prom_server.c
     )
 
 find_package(SQLite)
diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c
index 9ed32da0..248ffb5a 100644
--- a/src/apps/relay/mainrelay.c
+++ b/src/apps/relay/mainrelay.c
@@ -31,9 +31,7 @@
 #include "mainrelay.h"
 #include "dbdrivers/dbdriver.h"
 
-#if !defined(TURN_NO_PROMETHEUS)
 #include "prom_server.h"
-#endif
 
 #if defined(WINDOWS)
     #include <Iphlpapi.h>
@@ -218,11 +216,9 @@ turn_params_t turn_params = {
     0, /* bps_capacity_allocated */
     0, /* total_quota */
     0, /* user_quota */
-    #if !defined(TURN_NO_PROMETHEUS)
     0, /* prometheus disabled by default */
     DEFAULT_PROM_SERVER_PORT, /* prometheus port */
     0, /* prometheus username labelling disabled by default when prometheus is enabled */
-    #endif
 
     ///////////// Users DB //////////////
     { (TURN_USERDB_TYPE)0, {"\0","\0"}, {0,NULL, {NULL,0}} },
@@ -2032,7 +2028,6 @@ static void set_option(int c, char *value)
         turn_params.use_redis_statsdb = 1;
         break;
 #endif
-#if !defined(TURN_NO_PROMETHEUS)
 	case PROMETHEUS_OPT:
 		turn_params.prometheus = 1;
 		break;
@@ -2042,7 +2037,6 @@ static void set_option(int c, char *value)
 	case PROMETHEUS_ENABLE_USERNAMES_OPT:
 		turn_params.prometheus_username_labels = 1;
 		break;
-#endif
 	case AUTH_SECRET_OPT:
 		turn_params.use_auth_secret_with_timestamp = 1;
         use_tltc = 1;
@@ -3131,19 +3125,7 @@ int main(int argc, char **argv)
 #endif
 
 	drop_privileges();
-#if !defined(TURN_NO_PROMETHEUS)
-	int prometheus_status = start_prometheus_server();
-	if (prometheus_status < 0) {
-	  TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Could not start Prometheus collector!\n");
-	}
-	else if (prometheus_status == 1) {
-	  TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "Prometheus collector disabled, not started.\n");
-	}
-	else {
-	  TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "Prometheus collector started successfully.\n");
-	}
-#endif
-
+	start_prometheus_server();
 
 	run_listener_server(&(turn_params.listener));
 
diff --git a/src/apps/relay/mainrelay.h b/src/apps/relay/mainrelay.h
index 0c997a55..76245f55 100644
--- a/src/apps/relay/mainrelay.h
+++ b/src/apps/relay/mainrelay.h
@@ -307,11 +307,9 @@ typedef struct _turn_params_ {
   band_limit_t bps_capacity_allocated;
   vint total_quota;
   vint user_quota;
-  #if !defined(TURN_NO_PROMETHEUS)
   int prometheus;
   int prometheus_port;
-  int  prometheus_username_labels;
-  #endif
+  int prometheus_username_labels;
 
 
 /////// Users DB ///////////
diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c
index f2ee98c4..ed5bc68a 100644
--- a/src/apps/relay/ns_ioalib_engine_impl.c
+++ b/src/apps/relay/ns_ioalib_engine_impl.c
@@ -38,9 +38,7 @@
 
 #include "ns_ioalib_impl.h"
 
-#if !defined(TURN_NO_PROMETHEUS)
 #include "prom_server.h"
-#endif
 
 #if TLS_SUPPORTED
 #include <event2/bufferevent_ssl.h>
diff --git a/src/apps/relay/prom_server.c b/src/apps/relay/prom_server.c
index 7de1f95c..3d19c293 100644
--- a/src/apps/relay/prom_server.c
+++ b/src/apps/relay/prom_server.c
@@ -1,7 +1,8 @@
-#if !defined(TURN_NO_PROMETHEUS)
-
 #include "mainrelay.h"
 #include "prom_server.h"
+#include "ns_turn_utils.h"
+
+#if !defined(TURN_NO_PROMETHEUS)
 
 
 prom_counter_t *turn_traffic_rcvp;
@@ -27,9 +28,10 @@ prom_counter_t *turn_total_traffic_peer_sentb;
 prom_gauge_t *turn_total_allocations;
 
 
-int start_prometheus_server(void){
+void start_prometheus_server(void){
   if (turn_params.prometheus == 0){
-    return 1;
+    TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus collector disabled, not started\n");
+    return;
   }
   prom_collector_registry_default_init();
 
@@ -86,9 +88,13 @@ int start_prometheus_server(void){
   }
   struct MHD_Daemon *daemon = promhttp_start_daemon(flags, turn_params.prometheus_port, NULL, NULL);
   if (daemon == NULL) {
-    return -1;
+    TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "could not start prometheus collector\n");
+    return;
   }
-  return 0;
+
+  TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus collector started successfully\n");
+
+  return;
 }
 
 void prom_set_finished_traffic(const char* realm, const char* user, unsigned long rsvp, unsigned long rsvb, unsigned long sentp, unsigned long sentb, bool peer){
@@ -135,4 +141,11 @@ void prom_dec_allocation(void) {
   }
 }
 
+#else
+
+void start_prometheus_server(void){
+	  TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "turnserver compiled without prometheus support\n");
+    return;
+}
+
 #endif /* TURN_NO_PROMETHEUS */
diff --git a/src/apps/relay/prom_server.h b/src/apps/relay/prom_server.h
index 9a2b500a..c58e2fa8 100644
--- a/src/apps/relay/prom_server.h
+++ b/src/apps/relay/prom_server.h
@@ -2,6 +2,8 @@
 #ifndef __PROM_SERVER_H__
 #define __PROM_SERVER_H__
 
+#define DEFAULT_PROM_SERVER_PORT (9641)
+
 #if !defined(TURN_NO_PROMETHEUS)
 
 #include <signal.h>
@@ -20,8 +22,6 @@ extern "C" {
 }
 #endif /* __clplusplus */
 
-#define DEFAULT_PROM_SERVER_PORT (9641)
-
 extern prom_counter_t *turn_new_allocation;
 extern prom_counter_t *turn_refreshed_allocation;
 extern prom_counter_t *turn_deleted_allocation;
@@ -55,12 +55,15 @@ extern "C" {
 #endif
 
 
-int start_prometheus_server(void);
+void start_prometheus_server(void);
 
 void prom_set_finished_traffic(const char* realm, const char* user, unsigned long rsvp, unsigned long rsvb, unsigned long sentp, unsigned long sentb, bool peer);
 
 void prom_inc_allocation(void);
 void prom_dec_allocation(void);
+#else
+
+void start_prometheus_server(void);
 
 #endif /* TURN_NO_PROMETHEUS */