diff --git a/src/apps/debugger/debug_managers/BreakpointManager.cpp b/src/apps/debugger/debug_managers/BreakpointManager.cpp
index 998f9fcd04..71dd193281 100644
--- a/src/apps/debugger/debug_managers/BreakpointManager.cpp
+++ b/src/apps/debugger/debug_managers/BreakpointManager.cpp
@@ -494,8 +494,13 @@ BreakpointManager::_UpdateBreakpointInstallation(Breakpoint* breakpoint)
 
 	if (shouldBeInstalled) {
 		// install
-		status_t error = fDebuggerInterface->InstallBreakpoint(
-			breakpoint->Address());
+		status_t error = B_OK;
+		// if we're not actually connected to a team, silently
+		// allow setting the breakpoint so it's saved to settings
+		// for when we do connect/have the team in the debugger.
+		if (fDebuggerInterface->Connected())
+			fDebuggerInterface->InstallBreakpoint(breakpoint->Address());
+
 		if (error != B_OK)
 			return error;