diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
index 4f4b2b48..6d87da46 100644
--- a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java
@@ -11,6 +11,7 @@ import io.xpipe.core.process.ShellControl;
 import lombok.Getter;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 public interface ExternalTerminalType extends PrefsChoiceValue {
 
@@ -119,7 +120,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
 
     public static final ExternalTerminalType CUSTOM = new CustomType();
 
-    public static final List<ExternalTerminalType> ALL = List.of(
+    public static final List<ExternalTerminalType> ALL = Stream.of(
                     WINDOWS_TERMINAL,
                     POWERSHELL,
                     CMD,
@@ -130,15 +131,15 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
                     ITERM2,
                     MACOS_TERMINAL,
                     CUSTOM)
-            .stream()
             .filter(terminalType -> terminalType.isSelectable())
             .toList();
 
     public static ExternalTerminalType getDefault() {
         return ALL.stream()
+                .filter(externalTerminalType -> !externalTerminalType.equals(CUSTOM))
                 .filter(terminalType -> terminalType.isAvailable())
                 .findFirst()
-                .orElse(CUSTOM);
+                .orElse(null);
     }
 
     public abstract void launch(String name, String command) throws Exception;
diff --git a/app/src/main/java/io/xpipe/app/util/TerminalHelper.java b/app/src/main/java/io/xpipe/app/util/TerminalHelper.java
index a614d035..8c18e061 100644
--- a/app/src/main/java/io/xpipe/app/util/TerminalHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/TerminalHelper.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.util;
 
+import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.core.process.CommandControl;
 
@@ -17,7 +18,7 @@ public class TerminalHelper {
 
         var type = AppPrefs.get().terminalType().getValue();
         if (type == null) {
-            throw new IllegalStateException("No terminal has been configured to be used");
+            throw new IllegalStateException(AppI18n.get("noTerminalSet"));
         }
 
         type.launch(title, command);
diff --git a/app/src/main/resources/io/xpipe/app/resources/lang/translations_en.properties b/app/src/main/resources/io/xpipe/app/resources/lang/translations_en.properties
index ad87738a..aab630a2 100644
--- a/app/src/main/resources/io/xpipe/app/resources/lang/translations_en.properties
+++ b/app/src/main/resources/io/xpipe/app/resources/lang/translations_en.properties
@@ -120,6 +120,7 @@ gedit=GEdit
 leafpad=Leafpad
 mousepad=Mousepad
 pluma=Pluma
+noTerminalSet=No terminal application has been set. Please do so in the settings menu.
 textEdit=Text Edit
 sublime=Sublime Text
 newTable=new_table
diff --git a/version b/version
index 4ab9bf23..42db9a22 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.5.24
\ No newline at end of file
+0.5.25
\ No newline at end of file