diff --git a/server/core/config.c b/server/core/config.c
index 7723ae596..156558add 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -1338,6 +1338,10 @@ int i;
 	{
 		feedback.feedback_connect_timeout = atoi(value);
 	}
+	if (strcmp(name, "feedback_frequency") == 0)
+	{
+		feedback.feedback_frequency = atoi(value);
+	}
 	return 1;
 }
 
@@ -1389,6 +1393,7 @@ feedback_defaults()
 	feedback.feedback_timeout = _NOTIFICATION_OPERATION_TIMEOUT;
 	feedback.feedback_connect_timeout = _NOTIFICATION_CONNECT_TIMEOUT;
 	feedback.feedback_url = NULL;
+	feedback.feedback_frequency = 1800;
 	feedback.release_info = gateway.release_string;
 	feedback.sysname = gateway.sysname;
 	feedback.mac_sha1 = gateway.mac_sha1;
@@ -2221,14 +2226,14 @@ config_enable_feedback_task(void) {
 
 	if (enable_set && url_set && user_info_set) {
 		/* Add the task to the tasl list */
-        	if (hktask_add("send_feedback", module_feedback_send, cfg, 1800)) {
+        	if (hktask_add("send_feedback", module_feedback_send, cfg, cfg->feedback_frequency)) {
 
 			LOGIF(LM, (skygw_log_write_flush(
 				LOGFILE_MESSAGE,
 				"Notification service feedback task started: URL=%s, User-Info=%s, Frequency %u seconds",
 				cfg->feedback_url,
 				cfg->feedback_user_info,
-				1800)));
+				cfg->feedback_frequency)));
 		}
 	} else {
 		if (enable_set) {
diff --git a/server/include/notification.h b/server/include/notification.h
index 6a7f07bac..6e40f5aee 100644
--- a/server/include/notification.h
+++ b/server/include/notification.h
@@ -52,6 +52,7 @@ typedef struct {
 	int	feedback_timeout;		/**< An attempt to write/read the data times out and fails after this many seconds */
 	int	feedback_connect_timeout;	/**< An attempt to send the data times out and fails after this many seconds */
 	int	feedback_last_action;		/**< Holds the feedback last send action status */
+        int     feedback_frequency;             /*< Frequency of the housekeeper task */
         char	*release_info;			/**< Operating system Release name */
         char	*sysname;			/**< Operating system name */
         uint8_t	*mac_sha1;			/**< First available MAC address*/