diff --git a/app/Status.php b/app/Status.php
index a8a62376f..1b4a699c2 100644
--- a/app/Status.php
+++ b/app/Status.php
@@ -53,30 +53,24 @@ class Status extends Model
     // todo: deprecate after 0.6.0
     public function viewType()
     {
-        return Cache::remember('status:view-type:'.$this->id, 10080, function() {
-            $this->setType();
-            $media = $this->firstMedia();
-            $mime = explode('/', $media->mime)[0];
-            $count = $this->media()->count();
-            $type = ($mime == 'image') ? 'image' : 'video';
-            if($count > 1) {
-                $type = ($type == 'image') ? 'album' : 'video-album';
-            }
-            return $type;
-        });
+        if($this->type) {
+            return $this->type;
+        }
+        return $this->setType();
     }
 
     // todo: deprecate after 0.6.0
     public function setType()
     {
         if(in_array($this->type, self::STATUS_TYPES)) {
-            return;
+            return $this->type;
         }
         $mimes = $this->media->pluck('mime')->toArray();
         $type = StatusController::mimeTypeCheck($mimes);
         if($type) {
             $this->type = $type;
             $this->save();
+            return $type;
         }
     }
 
diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php
index 356ddb435..d07ac04b1 100644
--- a/app/Transformer/Api/StatusTransformer.php
+++ b/app/Transformer/Api/StatusTransformer.php
@@ -41,7 +41,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
             'language'                  => null,
             'pinned'                    => null,
 
-            'pf_type'          => $status->type,
+            'pf_type'          => $status->type ?? $status->setType(),
         ];
     }
 
diff --git a/config/pixelfed.php b/config/pixelfed.php
index ca1b4be2d..c13931be6 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -23,7 +23,7 @@ return [
     | This value is the version of your PixelFed instance.
     |
     */
-    'version' => '0.5.0',
+    'version' => '0.5.1',
 
     /*
     |--------------------------------------------------------------------------