diff --git a/client/cmd/logout.go b/client/cmd/logout.go
index 31fd13e49..5e04a8c3a 100644
--- a/client/cmd/logout.go
+++ b/client/cmd/logout.go
@@ -20,7 +20,7 @@ var logoutCmd = &cobra.Command{
 
 		cmd.SetOut(cmd.OutOrStdout())
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*7)
+		ctx, cancel := context.WithTimeout(cmd.Context(), time.Second*15)
 		defer cancel()
 
 		conn, err := DialClientGRPCServer(ctx, daemonAddr)
diff --git a/shared/management/client/grpc.go b/shared/management/client/grpc.go
index 7e3004945..dc26253e9 100644
--- a/shared/management/client/grpc.go
+++ b/shared/management/client/grpc.go
@@ -503,7 +503,7 @@ func (c *GrpcClient) Logout() error {
 		return fmt.Errorf("get server public key: %w", err)
 	}
 
-	mgmCtx, cancel := context.WithTimeout(c.ctx, time.Second*5)
+	mgmCtx, cancel := context.WithTimeout(c.ctx, time.Second*15)
 	defer cancel()
 
 	message := &proto.Empty{}