diff --git a/api4/cloud.go b/api4/cloud.go
index cc8c977dbb..32cb798799 100644
--- a/api4/cloud.go
+++ b/api4/cloud.go
@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"time"
@@ -303,14 +302,14 @@ func getSubscriptionInvoicePDF(c *Context, w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	pdfData, appErr := c.App.Cloud().GetInvoicePDF(c.Params.InvoiceId)
+	pdfData, filename, appErr := c.App.Cloud().GetInvoicePDF(c.Params.InvoiceId)
 	if appErr != nil {
 		c.Err = model.NewAppError("Api4.getSuscriptionInvoicePDF", "api.cloud.request_error", nil, appErr.Error(), http.StatusInternalServerError)
 		return
 	}
 
 	err := writeFileResponse(
-		fmt.Sprintf("%s.pdf", c.Params.InvoiceId),
+		filename,
 		"application/pdf",
 		int64(binary.Size(pdfData)),
 		time.Now(),
diff --git a/einterfaces/cloud.go b/einterfaces/cloud.go
index bf0b9f4847..6c56cac473 100644
--- a/einterfaces/cloud.go
+++ b/einterfaces/cloud.go
@@ -19,5 +19,5 @@ type CloudInterface interface {
 
 	GetSubscription() (*model.Subscription, *model.AppError)
 	GetInvoicesForSubscription() ([]*model.Invoice, *model.AppError)
-	GetInvoicePDF(invoiceID string) ([]byte, *model.AppError)
+	GetInvoicePDF(invoiceID string) ([]byte, string, *model.AppError)
 }