diff --git a/resources/views/default.blade.php b/resources/views/default.blade.php
index 9da41dfb..a3ee51e4 100644
--- a/resources/views/default.blade.php
+++ b/resources/views/default.blade.php
@@ -47,7 +47,7 @@
         {{-- Custom CSS --}}
         @if(!empty(config('larecipe.ui.additional_css')))
             @foreach(config('larecipe.ui.additional_css') as $css)
-                <link rel="stylesheet" type="text/css" href="{{ asset($css) }}">
+                <link rel="stylesheet" type="text/css" href="{{ asset($css) . '?id=' . \Illuminate\Support\Str::random(8) }}">
             @endforeach
         @endif
     </head>
@@ -67,7 +67,7 @@
         {{-- Custom JS --}}
         @if(!empty(config('larecipe.ui.additional_js')))
             @foreach(config('larecipe.ui.additional_js') as $js)
-                <script type="text/javascript" src="{{ asset($js) }}"></script>
+                <script type="text/javascript" src="{{ asset($js) . '?id=' . \Illuminate\Support\Str::random(8) }}"></script>
             @endforeach
         @endif
 
diff --git a/tests/Feature/BustCustomAssetsCacheTest.php b/tests/Feature/BustCustomAssetsCacheTest.php
new file mode 100644
index 00000000..dd3bc3b8
--- /dev/null
+++ b/tests/Feature/BustCustomAssetsCacheTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace BinaryTorch\LaRecipe\Tests\Feature;
+
+use Illuminate\Support\Facades\Config;
+use BinaryTorch\LaRecipe\Tests\TestCase;
+
+class BustCustomAssetsCacheTest extends TestCase
+{
+    /** @test */
+    public function custom_css_and_js_display_random_string_on_query_param()
+    {
+        // set the docs path and landing
+        Config::set('larecipe.docs.path', 'tests/views/docs');
+        Config::set('larecipe.docs.landing', 'foo');
+
+        // set auth to false
+        Config::set('larecipe.settings.auth', false);
+
+        $customCssFile = 'veryUniqueCssCustomFile.css';
+        $customJsFile = 'veryUniqueJsCustomFile.js';
+
+        Config::set('larecipe.ui.additional_css', [ "/js/{$customCssFile}" ]);
+        Config::set('larecipe.ui.additional_js', [ "/js/{$customJsFile}" ]);
+
+        // guest can view foo page
+        $this->get('/docs/1.0')
+            ->assertStatus(200)
+            ->assertSee("/js/{$customCssFile}?id=")
+            ->assertSee("/js/{$customJsFile}?id=");
+
+    }
+
+
+
+}