diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 18c8d477464..5957dfc0251 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -603,7 +603,7 @@ static void init_globals(void)
 	do_parameter("max connections", "-1", NULL);
 
 	do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup", NULL);
-	do_parameter("server services", "smb rpc nbt ldap cldap web kdc", NULL);
+	do_parameter("server services", "smb rpc nbt wrepl ldap cldap web kdc", NULL);
 	do_parameter("ntptr providor", "simple_ldb", NULL);
 	do_parameter("auth methods", "anonymous sam_ignoredomain", NULL);
 	do_parameter("private dir", dyn_PRIVATE_DIR, NULL);
diff --git a/source/wrepl_server/wrepl_server.c b/source/wrepl_server/wrepl_server.c
index b044ef82961..06a323d103d 100644
--- a/source/wrepl_server/wrepl_server.c
+++ b/source/wrepl_server/wrepl_server.c
@@ -381,6 +381,10 @@ static void wreplsrv_task_init(struct task_server *task)
  */
 static NTSTATUS wreplsrv_init(struct event_context *event_ctx, const struct model_ops *model_ops)
 {
+	if (!lp_wins_support()) {
+		return NT_STATUS_OK;
+	}
+
 	return task_server_startup(event_ctx, model_ops, wreplsrv_task_init);
 }