diff --git a/app/Models/Project.php b/app/Models/Project.php
index 1f39aa725..b7d34e876 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -116,10 +116,14 @@ public function databases()
     public function default_environment()
     {
         $default = $this->environments()->where('name', 'production')->first();
-        if (! $default) {
-            $default = $this->environments()->get()->sortBy('created_at')->first();
+        if ($default) {
+            return $default->name;
+        }
+        $default = $this->environments()->get();
+        if ($default->count() > 0) {
+            return $default->sortBy('created_at')->first()->name;
         }
 
-        return $default;
+        return null;
     }
 }
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index c1dd375ff..a6eb231d4 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -23,7 +23,7 @@
         <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
             @foreach ($projects as $project)
                 <div class="gap-2 border border-transparent cursor-pointer box group"
-                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment()?->name }}')">
+                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment() }}')">
                     <div class="flex flex-1 mx-6">
                         <div class="flex flex-col justify-center flex-1">
                             <div class="box-title">{{ $project->name }}</div>
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 76bae7a91..92d4a63f9 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -13,7 +13,7 @@
         @forelse ($projects as $project)
             <div class="box group" x-data x-on:click="goto('{{ $project->uuid }}')">
                 <div class="flex flex-col justify-center flex-1 mx-6"
-                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment()?->name }}')">
+                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment() }}')">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>