diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index 8c04bbf4a..a32817faa 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -21,10 +21,22 @@ class StatusController extends Controller
     {
         $user = Profile::whereUsername($username)->firstOrFail();
 
+        if($user->status != null) {
+            return ProfileController::accountCheck($user);
+        }
+
         $status = Status::whereProfileId($user->id)
                 ->whereNotIn('visibility',['draft','direct'])
                 ->findOrFail($id);
 
+        if($status->uri) {
+            $url = $status->uri;
+            if(ends_with($url, '/activity')) {
+                $url = str_replace('/activity', '', $url);
+            }
+            return redirect($url);
+        }
+
         if($status->visibility == 'private' || $user->is_private) {
             if(!Auth::check()) {
                 abort(403);