diff --git a/pdf.js b/pdf.js
index 33a21e38c..349589016 100644
--- a/pdf.js
+++ b/pdf.js
@@ -3807,23 +3807,21 @@ var CanvasGraphics = (function() {
             if (fontDescriptor && fontDescriptor.num) {
                 var fontDescriptor = this.xref.fetchIfRef(fontDescriptor);
                 fontName = fontDescriptor.get("FontName").name.replace("+", "_");
-                Fonts.setActive(fontName, size);
             }
 
             if (!fontName) {
                 // TODO: fontDescriptor is not available, fallback to default font
-                this.current.fontSize = size;
-                this.ctx.font = this.current.fontSize + 'px sans-serif';
-                Fonts.setActive("sans-serif", this.current.fontSize);
-                return;
+                fontName = "sans-serif";
             }
 
             this.current.fontName = fontName;
             this.current.fontSize = size;
 
-            this.ctx.font = this.current.fontSize + 'px "' + fontName + '"';
             if (this.ctx.$setFont) {
-              this.ctx.$setFont(fontName);
+              this.ctx.$setFont(fontName, size);
+            } else {
+              this.ctx.font = size + 'px "' + fontName + '"';
+              Fonts.setActive(fontName, size);
             }
         },
         setTextRenderingMode: function(mode) {
diff --git a/worker/client.js b/worker/client.js
index 84e44b94c..960e97496 100644
--- a/worker/client.js
+++ b/worker/client.js
@@ -250,9 +250,10 @@ function WorkerPDFDoc(canvas) {
       }
       this.strokeStyle = pattern;
     },
-    
-    "$setFont": function(name) {
-      Fonts.active = name;
+
+    "$setFont": function(name, size) {
+      this.font = size + 'px "' + name + '"';
+      Fonts.setActive(name, size);
     }
   }