diff --git a/pkg/proc/gdbserial/gdbserver.go b/pkg/proc/gdbserial/gdbserver.go
index 3c748b67..73234a44 100644
--- a/pkg/proc/gdbserial/gdbserver.go
+++ b/pkg/proc/gdbserial/gdbserver.go
@@ -874,7 +874,7 @@ func (p *Process) FindBreakpoint(pc uint64) (*proc.Breakpoint, bool) {
 
 func (p *Process) SetBreakpoint(addr uint64, kind proc.BreakpointKind, cond ast.Expr) (*proc.Breakpoint, error) {
 	if bp, ok := p.breakpoints[addr]; ok {
-		return nil, proc.BreakpointExistsError{bp.File, bp.Line, bp.Addr}
+		return bp, proc.BreakpointExistsError{bp.File, bp.Line, bp.Addr}
 	}
 	f, l, fn := p.bi.PCToLine(uint64(addr))
 	if fn == nil {
diff --git a/pkg/proc/native/proc.go b/pkg/proc/native/proc.go
index 4ff96b59..5c1d604a 100644
--- a/pkg/proc/native/proc.go
+++ b/pkg/proc/native/proc.go
@@ -198,7 +198,7 @@ func (dbp *Process) SetBreakpoint(addr uint64, kind proc.BreakpointKind, cond as
 	tid := dbp.currentThread.ID
 
 	if bp, ok := dbp.FindBreakpoint(addr); ok {
-		return nil, proc.BreakpointExistsError{bp.File, bp.Line, bp.Addr}
+		return bp, proc.BreakpointExistsError{bp.File, bp.Line, bp.Addr}
 	}
 
 	f, l, fn := dbp.bi.PCToLine(uint64(addr))