diff --git a/app/Media.php b/app/Media.php
index 2b77abe43..e6ed99126 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -41,10 +41,8 @@ class Media extends Model
 
     public function thumbnailUrl()
     {
-        $path = $this->thumbnail_path;
-        $url = Storage::url($path);
-
-        return url($url);
+        $path = $this->thumbnail_path ?? 'public/no-preview.png';
+        return url(Storage::url($path));
     }
 
     public function thumb()
diff --git a/app/Status.php b/app/Status.php
index 6d8defa25..1e729cf35 100644
--- a/app/Status.php
+++ b/app/Status.php
@@ -80,7 +80,7 @@ class Status extends Model
             $type = $this->type ?? $this->setType();
             $is_nsfw = !$showNsfw ? $this->is_nsfw : false;
             if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['photo', 'photo:album'])) {
-                return 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==';
+                return url(Storage::url('public/no-preview.png'));
             }
 
             return url(Storage::url($this->firstMedia()->thumbnail_path));
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
index d6b7ef32c..6c7dbc108 100755
--- a/storage/app/public/.gitignore
+++ b/storage/app/public/.gitignore
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!no-preview.png
\ No newline at end of file
diff --git a/storage/app/public/no-preview.png b/storage/app/public/no-preview.png
new file mode 100644
index 000000000..254fc88cc
Binary files /dev/null and b/storage/app/public/no-preview.png differ