diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py
index 354222e3d5..916c22c1d0 100644
--- a/src/calibre/ebooks/pdf/render/from_html.py
+++ b/src/calibre/ebooks/pdf/render/from_html.py
@@ -22,10 +22,10 @@ from calibre.ebooks.pdf.render.common import (inch, cm, mm, pica, cicero,
 from calibre.ebooks.pdf.render.engine import PdfDevice
 from calibre.ebooks.pdf.render.links import Links
 
-
 def get_page_size(opts, for_comic=False): # {{{
     use_profile = not (opts.override_profile_size or
-                       opts.output_profile.short_name == 'default')
+                       opts.output_profile.short_name == 'default' or
+                       opts.output_profile.width > 9999)
     if use_profile:
         w = (opts.output_profile.comic_screen_size[0] if for_comic else
                 opts.output_profile.width)
diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py
index 46a3e92821..eaec0e79bc 100644
--- a/src/calibre/ebooks/pdf/writer.py
+++ b/src/calibre/ebooks/pdf/writer.py
@@ -50,7 +50,7 @@ def get_pdf_printer(opts, for_comic=False, output_file_name=None): # {{{
         printer.setPaperSize(paper_size(opts.paper_size))
     else:
         if opts.output_profile.short_name == 'default' or \
-                opts.output_profile.width > 9999:
+                opts.output_profile.width > 9999 or opts.override_profile_size:
             if custom_size is None:
                 printer.setPaperSize(paper_size(opts.paper_size))
             else: