diff --git a/rabbitmq/rabbitmq.go b/rabbitmq/rabbitmq.go
index 47d378dd..486fd6ca 100644
--- a/rabbitmq/rabbitmq.go
+++ b/rabbitmq/rabbitmq.go
@@ -39,6 +39,7 @@ type (
 type Client interface {
 	SubscribeToLndInvoices(context.Context, IncomingInvoiceHandler) error
 	StartPublishInvoices(context.Context, SubscribeToInvoicesFunc, EncodeOutgoingInvoiceFunc) error
+	PublishToLndhubExchange(ctx context.Context, invoice models.Invoice, payloadFunc EncodeOutgoingInvoiceFunc) error
 	// Close will close all connections to rabbitmq
 	Close() error
 }
@@ -274,13 +275,13 @@ func (client *DefaultClient) StartPublishInvoices(ctx context.Context, invoicesS
 		case <-ctx.Done():
 			return context.Canceled
 		case incomingInvoice := <-in:
-			err = client.publishToLndhubExchange(ctx, incomingInvoice, payloadFunc)
+			err = client.PublishToLndhubExchange(ctx, incomingInvoice, payloadFunc)
 
 			if err != nil {
 				captureErr(client.logger, err)
 			}
 		case outgoing := <-out:
-			err = client.publishToLndhubExchange(ctx, outgoing, payloadFunc)
+			err = client.PublishToLndhubExchange(ctx, outgoing, payloadFunc)
 
 			if err != nil {
 				captureErr(client.logger, err)
@@ -289,7 +290,7 @@ func (client *DefaultClient) StartPublishInvoices(ctx context.Context, invoicesS
 	}
 }
 
-func (client *DefaultClient) publishToLndhubExchange(ctx context.Context, invoice models.Invoice, payloadFunc EncodeOutgoingInvoiceFunc) error {
+func (client *DefaultClient) PublishToLndhubExchange(ctx context.Context, invoice models.Invoice, payloadFunc EncodeOutgoingInvoiceFunc) error {
 	payload := bufPool.Get().(*bytes.Buffer)
 	err := payloadFunc(ctx, payload, invoice)
 	if err != nil {
diff --git a/republish_invoices/main.go b/republish_invoices/main.go
new file mode 100644
index 00000000..51e517ac
--- /dev/null
+++ b/republish_invoices/main.go
@@ -0,0 +1,90 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/getAlby/lndhub.go/db"
+	"github.com/getAlby/lndhub.go/db/models"
+	"github.com/getAlby/lndhub.go/lib"
+	"github.com/getAlby/lndhub.go/lib/service"
+	"github.com/getAlby/lndhub.go/rabbitmq"
+	"github.com/joho/godotenv"
+	"github.com/kelseyhightower/envconfig"
+	"github.com/sirupsen/logrus"
+)
+
+func main() {
+
+	c := &service.Config{}
+	// Load configruation from environment variables
+	err := godotenv.Load(".env")
+	if err != nil {
+		fmt.Println("Failed to load .env file")
+	}
+	logger := lib.Logger(c.LogFilePath)
+	startDate, endDate, err := loadStartAndEndIdFromEnv()
+	if err != nil {
+		logger.Fatalf("Could not load start and end id from env %v", err)
+	}
+	err = envconfig.Process("", c)
+	if err != nil {
+		logger.Fatalf("Error loading environment variables: %v", err)
+	}
+	// Open a DB connection based on the configured DATABASE_URI
+	dbConn, err := db.Open(c)
+	if err != nil {
+		logger.Fatalf("Error initializing db connection: %v", err)
+	}
+	rabbitmqClient, err := rabbitmq.Dial(c.RabbitMQUri,
+		rabbitmq.WithLndInvoiceExchange(c.RabbitMQLndInvoiceExchange),
+		rabbitmq.WithLndHubInvoiceExchange(c.RabbitMQLndhubInvoiceExchange),
+		rabbitmq.WithLndInvoiceConsumerQueueName(c.RabbitMQInvoiceConsumerQueueName),
+	)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	// close the connection gently at the end of the runtime
+	defer rabbitmqClient.Close()
+
+	result := []models.Invoice{}
+	err = dbConn.NewSelect().Model(&result).Where("settled_at > ?", startDate).Where("settled_at < ?", endDate).Scan(context.Background())
+	if err != nil {
+		logger.Fatal(err)
+	}
+	logrus.Infof("Found %d invoices", len(result))
+	svc := &service.LndhubService{
+		Config:         c,
+		DB:             dbConn,
+		Logger:         logger,
+		RabbitMQClient: rabbitmqClient,
+		InvoicePubSub:  service.NewPubsub(),
+	}
+	dryRun := os.Getenv("DRY_RUN") == "true"
+	errCount := 0
+	for _, inv := range result {
+		logger.Infof("Publishing invoice with hash %s", inv.RHash)
+		if dryRun {
+			continue
+		}
+		err = svc.RabbitMQClient.PublishToLndhubExchange(context.Background(), inv, svc.EncodeInvoiceWithUserLogin)
+		if err != nil {
+			errCount += 1
+			logger.Error(err)
+		}
+	}
+	logger.Infof("Published %d invoices, # errors %d", len(result), errCount)
+
+}
+
+func loadStartAndEndIdFromEnv() (start, end time.Time, err error) {
+	start, err = time.Parse(time.RFC3339, os.Getenv("START_DATE"))
+	if err != nil {
+		return
+	}
+	end, err = time.Parse(time.RFC3339, os.Getenv("END_DATE"))
+	return
+}