diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index c0c5c7a6d..e9cd27311 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -159,9 +159,14 @@
         </div>
     @endif
 
+
     <script>
         function gotoProject(uuid, environment) {
-            window.location.href = '/project/' + uuid + '/' + environment;
+            if (environment) {
+                window.location.href = '/project/' + uuid + '/' + environment;
+            } else {
+                window.location.href = '/project/' + uuid;
+            }
         }
     </script>
     {{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 88b2e12e9..a15f6e18f 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -32,8 +32,12 @@
     </div>
 
     <script>
-    function gotoProject(uuid, defaultEnvironment) {
-        window.location.href = '/project/' + uuid + '/' + defaultEnvironment;
+    function gotoProject(uuid, environment) {
+        if (environment) {
+            window.location.href = '/project/' + uuid + '/' + environment;
+        } else {
+            window.location.href = '/project/' + uuid;
+        }
     }
 </script>
 </div>