diff --git a/libshpool/src/daemon/server.rs b/libshpool/src/daemon/server.rs
index af621b2a..372a6478 100644
--- a/libshpool/src/daemon/server.rs
+++ b/libshpool/src/daemon/server.rs
@@ -43,6 +43,7 @@ use crate::daemon::exit_notify::ExitNotifier;
 const STDERR_FD: i32 = 2;
 const DEFAULT_INITIAL_SHELL_PATH: &str = "/usr/bin:/bin:/usr/sbin:/sbin";
 const DEFAULT_OUTPUT_SPOOL_LINES: usize = 500;
+const DEFAULT_PROMPT_PREFIX: &str = "shpool:$SHPOOL_SESSION_NAME ";
 
 pub struct Server {
     config: config::Config,
@@ -626,7 +627,8 @@ impl Server {
         });
 
         // inject the prompt prefix, if any
-        let prompt_prefix = self.config.prompt_prefix.clone().unwrap_or(String::from(""));
+        let prompt_prefix =
+            self.config.prompt_prefix.clone().unwrap_or(String::from(DEFAULT_PROMPT_PREFIX));
         if let Some(shell_basename) = shell_basename {
             if !prompt_prefix.is_empty() {
                 if let Err(err) =
diff --git a/shpool/tests/data/custom_detach_keybinding.toml b/shpool/tests/data/custom_detach_keybinding.toml
index f2232662..01d9fb1a 100644
--- a/shpool/tests/data/custom_detach_keybinding.toml
+++ b/shpool/tests/data/custom_detach_keybinding.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/disable_symlink_ssh_auth_sock.toml b/shpool/tests/data/disable_symlink_ssh_auth_sock.toml
index d07b3ee0..5b398927 100644
--- a/shpool/tests/data/disable_symlink_ssh_auth_sock.toml
+++ b/shpool/tests/data/disable_symlink_ssh_auth_sock.toml
@@ -3,6 +3,7 @@ noecho = true
 shell = "/bin/bash"
 nosymlink_ssh_auth_sock = true
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/forward_env.toml b/shpool/tests/data/forward_env.toml
index 9e511107..a9619a56 100644
--- a/shpool/tests/data/forward_env.toml
+++ b/shpool/tests/data/forward_env.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 forward_env = ["FOO", "BAR"]
 
diff --git a/shpool/tests/data/long_noop_keybinding.toml b/shpool/tests/data/long_noop_keybinding.toml
index 06393613..f975a6fa 100644
--- a/shpool/tests/data/long_noop_keybinding.toml
+++ b/shpool/tests/data/long_noop_keybinding.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/no_etc_environment.toml b/shpool/tests/data/no_etc_environment.toml
index b47b6a75..0c0c1b9f 100644
--- a/shpool/tests/data/no_etc_environment.toml
+++ b/shpool/tests/data/no_etc_environment.toml
@@ -3,6 +3,7 @@ noecho = true
 noread_etc_environment = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/norc.toml b/shpool/tests/data/norc.toml
index 826451e2..0d7efff1 100644
--- a/shpool/tests/data/norc.toml
+++ b/shpool/tests/data/norc.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/restore_lines.toml b/shpool/tests/data/restore_lines.toml
index 22d63cff..a5141090 100644
--- a/shpool/tests/data/restore_lines.toml
+++ b/shpool/tests/data/restore_lines.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = { lines = 2 }
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/restore_many_lines.toml b/shpool/tests/data/restore_many_lines.toml
index b6e0ee7e..6f1088ca 100644
--- a/shpool/tests/data/restore_many_lines.toml
+++ b/shpool/tests/data/restore_many_lines.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = { lines = 5000 }
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/restore_screen.toml b/shpool/tests/data/restore_screen.toml
index b1211c62..2395ce8b 100644
--- a/shpool/tests/data/restore_screen.toml
+++ b/shpool/tests/data/restore_screen.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "screen"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "
diff --git a/shpool/tests/data/user_env.toml b/shpool/tests/data/user_env.toml
index 611ed75f..286fb1e8 100644
--- a/shpool/tests/data/user_env.toml
+++ b/shpool/tests/data/user_env.toml
@@ -2,6 +2,7 @@ norc = true
 noecho = true
 shell = "/bin/bash"
 session_restore_mode = "simple"
+prompt_prefix = ""
 
 [env]
 PS1 = "prompt> "