diff --git a/helpers/getFontLoaderConfig.js b/helpers/getFontLoaderConfig.js
index 69a6f15..8f63add 100644
--- a/helpers/getFontLoaderConfig.js
+++ b/helpers/getFontLoaderConfig.js
@@ -4,7 +4,14 @@ const getFonts = require('./lib/fonts');
 
 const factory = globals => {
     return function() {
-        const fontConfig = getFonts('webFontLoaderConfig', globals.getThemeSettings(), globals.handlebars);
+        const options = arguments[arguments.length - 1];
+
+        // Default is "false"
+        const classes = !!options.hash['classes'];
+
+        const fontConfig = getFonts('webFontLoaderConfig', globals.getThemeSettings(),
+            globals.handlebars, {classes});
+
         return new globals.handlebars.SafeString(JSON.stringify(fontConfig));
     };
 };
diff --git a/helpers/lib/fonts.js b/helpers/lib/fonts.js
index 3a6eb01..b823613 100644
--- a/helpers/lib/fonts.js
+++ b/helpers/lib/fonts.js
@@ -144,7 +144,7 @@ module.exports = function(format, themeSettings, handlebars, options) {
 
     case 'webFontLoaderConfig':
         // Build configs
-        return Object.entries(parsedFonts).reduce(
+        return Object.assign(Object.entries(parsedFonts).reduce(
             (
                 configs,
                 [key, value]
@@ -162,7 +162,7 @@ module.exports = function(format, themeSettings, handlebars, options) {
                 );
             },
             {}
-        );
+        ), {classes: options.classes});
 
     case 'providerLists':
     default: