diff --git a/lib/config-generator.js b/lib/config-generator.js
index e2e133a8..7146f416 100644
--- a/lib/config-generator.js
+++ b/lib/config-generator.js
@@ -280,7 +280,7 @@ class ConfigGenerator {
 
         if (this.webpackConfig.useImagesLoader) {
             // Default filename can be overridden using Encore.configureFilenames({ images: '...' })
-            let filename = 'images/[name].[hash:8].[ext]';
+            let filename = this.webpackConfig.useVersioning ? 'images/[name].[hash:8].[ext]' : 'images/[name].[ext]';
             if (this.webpackConfig.configuredFilenames.images) {
                 filename = this.webpackConfig.configuredFilenames.images;
             }
@@ -308,7 +308,7 @@ class ConfigGenerator {
 
         if (this.webpackConfig.useFontsLoader) {
             // Default filename can be overridden using Encore.configureFilenames({ fonts: '...' })
-            let filename = 'fonts/[name].[hash:8].[ext]';
+            let filename = this.webpackConfig.useVersioning ? 'fonts/[name].[hash:8].[ext]' : 'fonts/[name].[ext]';
             if (this.webpackConfig.configuredFilenames.fonts) {
                 filename = this.webpackConfig.configuredFilenames.fonts;
             }