diff --git a/config/filesystems.php b/config/filesystems.php
index a265cbb3e..4d843013c 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -46,6 +46,7 @@ return [
         'local' => [
             'driver' => 'local',
             'root'   => storage_path('app'),
+            'url'    => '/storage/app',
         ],
 
         's3' => [
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index af2b86bb6..eee21aeb8 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -88,6 +88,13 @@ class ServiceProvider extends ModuleServiceProvider
             Schema::defaultStringLength(191);
         }
 
+        // Fix use of Storage::url() for local disks that haven't been configured correctly
+        foreach (Config::get('filesystems.disks') as $key => $config) {
+            if ($config['driver'] === 'local' && ends_with($config['root'], '/storage/app') && empty($config['url'])) {
+                Config::set("filesystems.disks.$key.url", '/storage/app');
+            }
+        }
+
         Paginator::defaultSimpleView('system::pagination.simple-default');
 
         /*