diff --git a/app/Models/Media.php b/app/Models/Media.php
index 27ebe56..4f3d7a9 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -256,6 +256,19 @@ class Media extends Model
             'status' => '',
         ]);
 
+        if ($request->get('storage') === null) {
+            // We store images by default locally
+            if (strpos($file->getMimeType(), 'image/') === 0) {
+                $request->merge([
+                    'storage' => 'local',
+                ]);
+            } else {
+                $request->merge([
+                    'storage' => 'cdn',
+                ]);
+            }
+        }
+
         $mediaItem = $request->user()->media()->create($request->all());
         $mediaItem->updateWithUploadedFile($file);