diff --git a/backend/app/api/routes/teams.py b/backend/app/api/routes/teams.py
index 4abf7d4f..3f64796c 100644
--- a/backend/app/api/routes/teams.py
+++ b/backend/app/api/routes/teams.py
@@ -243,6 +243,8 @@ async def stream(
         member.skills = member.skills
 
     return StreamingResponse(
-        generator(team, members, team_chat.messages, thread_id),
+        generator(
+            team, members, team_chat.messages, thread_id, team_chat.interrupt_decision
+        ),
         media_type="text/event-stream",
     )
diff --git a/backend/app/core/graph/build.py b/backend/app/core/graph/build.py
index 1a4ba1df..636f0577 100644
--- a/backend/app/core/graph/build.py
+++ b/backend/app/core/graph/build.py
@@ -5,8 +5,9 @@
 from functools import partial
 from typing import Any
 
-from langchain_core.messages import AIMessage, AnyMessage, HumanMessage
+from langchain_core.messages import AIMessage, AnyMessage, HumanMessage, ToolMessage
 from langchain_core.runnables import RunnableLambda
+from langchain_core.runnables.config import RunnableConfig
 from langgraph.checkpoint import BaseCheckpointSaver
 from langgraph.graph import END, StateGraph
 from langgraph.graph.graph import CompiledGraph
@@ -27,7 +28,7 @@
     WorkerNode,
 )
 from app.core.graph.skills import all_skills
-from app.models import ChatMessage, Member, Team
+from app.models import ChatMessage, InterruptDecision, Member, Team
 
 
 def convert_hierarchical_team_to_dict(
@@ -184,7 +185,6 @@ def exit_chain(state: TeamState) -> dict[str, list[AnyMessage]]:
     Pass the final response back to the top-level graph's state.
     """
     answer = state["messages"][-1]
-    # Add human message at the end to prevent consecutive AI message which will cause error for some models
     return {"messages": [answer]}
 
 
@@ -397,7 +397,11 @@ def convert_messages_and_tasks_to_dict(data: Any) -> Any:
 
 
 async def generator(
-    team: Team, members: list[Member], messages: list[ChatMessage], thread_id: str
+    team: Team,
+    members: list[Member],
+    messages: list[ChatMessage],
+    thread_id: str,
+    interrupt_decision: InterruptDecision | None = None,
 ) -> AsyncGenerator[Any, Any]:
     """Create the graph and stream responses as JSON."""
     formatted_messages = [
@@ -417,7 +421,7 @@ async def generator(
             root = create_hierarchical_graph(
                 teams, leader_name=team_leader, memory=memory
             )
-            state = {
+            state: dict[str, Any] | None = {
                 "messages": formatted_messages,
                 "team": teams[team_leader],
                 "main_task": formatted_messages,
@@ -439,11 +443,32 @@ async def generator(
                 ),
                 "next": first_member.name,
             }
+
+        config: RunnableConfig = {
+            "configurable": {"thread_id": thread_id},
+            "recursion_limit": 25,
+        }
+        # Handle interrupt logic by orriding state
+        if interrupt_decision == InterruptDecision.APPROVED:
+            state = None
+        elif interrupt_decision == InterruptDecision.REJECTED:
+            current_values = await root.aget_state(config)
+            tool_calls = current_values.values["messages"][-1].tool_calls
+            state = {
+                "messages": [
+                    ToolMessage(
+                        tool_call_id=tool_call["id"],
+                        content="API call denied by user. Continue assisting.",
+                    )
+                    for tool_call in tool_calls
+                ]
+            }
+
         async for output in root.astream_events(
             state,
             version="v1",
             include_names=["work", "delegate", "summarise"],
-            config={"configurable": {"thread_id": thread_id}, "recursion_limit": 25},
+            config=config,
         ):
             if output["event"] == "on_chain_end":
                 output_data = output["data"]["output"]
@@ -453,6 +478,10 @@ async def generator(
                 formatted_output = f"data: {json.dumps(transformed_output_data)}\n\n"
                 if formatted_output != "data: null\n\n":
                     yield formatted_output
+        snapshot = await root.aget_state(config)
+        if snapshot.next:
+            # Interrupt occured
+            yield f"data: {json.dumps({'interrupt': True})}\n\n"
     except Exception as e:
         error_message = {
             "error": str(e),
diff --git a/backend/app/models.py b/backend/app/models.py
index 6efea6b5..9d8bb8d9 100644
--- a/backend/app/models.py
+++ b/backend/app/models.py
@@ -112,8 +112,18 @@ class ChatMessage(BaseModel):
     content: str
 
 
+class InterruptDecision(Enum):
+    APPROVED = "approved"
+    REJECTED = "rejected"
+
+
+class Interrupt(BaseModel):
+    decision: InterruptDecision
+
+
 class TeamChat(BaseModel):
     messages: list[ChatMessage]
+    interrupt_decision: InterruptDecision | None = None
 
 
 class Team(TeamBase, table=True):
diff --git a/frontend/src/client/index.ts b/frontend/src/client/index.ts
index 73b04c5d..c96fd6ff 100644
--- a/frontend/src/client/index.ts
+++ b/frontend/src/client/index.ts
@@ -13,6 +13,7 @@ export type { ChatMessageType } from './models/ChatMessageType';
 export type { CheckpointOut } from './models/CheckpointOut';
 export type { CreateThreadOut } from './models/CreateThreadOut';
 export type { HTTPValidationError } from './models/HTTPValidationError';
+export type { InterruptDecision } from './models/InterruptDecision';
 export type { MemberCreate } from './models/MemberCreate';
 export type { MemberOut } from './models/MemberOut';
 export type { MembersOut } from './models/MembersOut';
@@ -47,6 +48,7 @@ export { $ChatMessageType } from './schemas/$ChatMessageType';
 export { $CheckpointOut } from './schemas/$CheckpointOut';
 export { $CreateThreadOut } from './schemas/$CreateThreadOut';
 export { $HTTPValidationError } from './schemas/$HTTPValidationError';
+export { $InterruptDecision } from './schemas/$InterruptDecision';
 export { $MemberCreate } from './schemas/$MemberCreate';
 export { $MemberOut } from './schemas/$MemberOut';
 export { $MembersOut } from './schemas/$MembersOut';
diff --git a/frontend/src/client/models/CreateThreadOut.ts b/frontend/src/client/models/CreateThreadOut.ts
index 620b49b1..bb9a6b0e 100644
--- a/frontend/src/client/models/CreateThreadOut.ts
+++ b/frontend/src/client/models/CreateThreadOut.ts
@@ -9,6 +9,6 @@ export type CreateThreadOut = {
     id: string;
     query: string;
     updated_at: string;
-    last_checkpoint: CheckpointOut;
+    last_checkpoint: (CheckpointOut | null);
 };
 
diff --git a/frontend/src/client/models/InterruptDecision.ts b/frontend/src/client/models/InterruptDecision.ts
new file mode 100644
index 00000000..63a82e6b
--- /dev/null
+++ b/frontend/src/client/models/InterruptDecision.ts
@@ -0,0 +1,6 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type InterruptDecision = 'approved' | 'rejected';
diff --git a/frontend/src/client/models/TeamChat.ts b/frontend/src/client/models/TeamChat.ts
index f0f6dc66..3e28fdb2 100644
--- a/frontend/src/client/models/TeamChat.ts
+++ b/frontend/src/client/models/TeamChat.ts
@@ -4,8 +4,10 @@
 /* eslint-disable */
 
 import type { ChatMessage } from './ChatMessage';
+import type { InterruptDecision } from './InterruptDecision';
 
 export type TeamChat = {
     messages: Array<ChatMessage>;
+    interrupt_decision?: (InterruptDecision | null);
 };
 
diff --git a/frontend/src/client/schemas/$CreateThreadOut.ts b/frontend/src/client/schemas/$CreateThreadOut.ts
index 78fd938e..2c71ae80 100644
--- a/frontend/src/client/schemas/$CreateThreadOut.ts
+++ b/frontend/src/client/schemas/$CreateThreadOut.ts
@@ -19,7 +19,12 @@ export const $CreateThreadOut = {
             format: 'date-time',
         },
         last_checkpoint: {
-            type: 'CheckpointOut',
+            type: 'any-of',
+            contains: [{
+                type: 'CheckpointOut',
+            }, {
+                type: 'null',
+            }],
             isRequired: true,
         },
     },
diff --git a/frontend/src/client/schemas/$InterruptDecision.ts b/frontend/src/client/schemas/$InterruptDecision.ts
new file mode 100644
index 00000000..e0547da7
--- /dev/null
+++ b/frontend/src/client/schemas/$InterruptDecision.ts
@@ -0,0 +1,7 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export const $InterruptDecision = {
+    type: 'Enum',
+} as const;
diff --git a/frontend/src/client/schemas/$TeamChat.ts b/frontend/src/client/schemas/$TeamChat.ts
index b177c5cf..90a59e9f 100644
--- a/frontend/src/client/schemas/$TeamChat.ts
+++ b/frontend/src/client/schemas/$TeamChat.ts
@@ -11,5 +11,13 @@ export const $TeamChat = {
             },
             isRequired: true,
         },
+        interrupt_decision: {
+            type: 'any-of',
+            contains: [{
+                type: 'InterruptDecision',
+            }, {
+                type: 'null',
+            }],
+        },
     },
 } as const;
diff --git a/frontend/src/components/Members/EditMember.tsx b/frontend/src/components/Members/EditMember.tsx
index 74d151b6..4fe966f7 100644
--- a/frontend/src/components/Members/EditMember.tsx
+++ b/frontend/src/components/Members/EditMember.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  Checkbox,
   FormControl,
   FormErrorMessage,
   FormLabel,
@@ -51,7 +52,11 @@ const customSelectOption = {
 // TODO: Place this somewhere else.
 const AVAILABLE_MODELS = {
   ChatOpenAI: ["gpt-3.5-turbo", "gpt-4-turbo", "gpt-4o"],
-  ChatAnthropic: ["claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307"],
+  ChatAnthropic: [
+    "claude-3-opus-20240229",
+    "claude-3-sonnet-20240229",
+    "claude-3-haiku-20240307",
+  ],
   // ChatCohere: ["command"],
   // ChatGoogleGenerativeAI: ["gemini-pro"],
 }
@@ -238,6 +243,14 @@ export function EditMember({
                 </FormControl>
               )}
             />
+            {member.type.startsWith("freelancer") ? (
+              <FormControl mt={4}>
+                <FormLabel htmlFor="interrupt">Human In The Loop</FormLabel>
+                <Checkbox {...register("interrupt")}>
+                  Require approval before executing skills.
+                </Checkbox>
+              </FormControl>
+            ) : null}
             <FormControl mt={4} isRequired isInvalid={!!errors.role}>
               <FormLabel htmlFor="provider">Provider</FormLabel>
               <Select
diff --git a/frontend/src/components/Teams/ChatTeam.tsx b/frontend/src/components/Teams/ChatTeam.tsx
index 65a0d565..993780b8 100644
--- a/frontend/src/components/Teams/ChatTeam.tsx
+++ b/frontend/src/components/Teams/ChatTeam.tsx
@@ -1,6 +1,7 @@
 import {
   Box,
   Button,
+  ButtonGroup,
   Container,
   Icon,
   IconButton,
@@ -22,6 +23,7 @@ import {
   type ThreadUpdate,
   ThreadsService,
   type ThreadCreate,
+  type InterruptDecision,
 } from "../../client"
 import { useMutation, useQuery, useQueryClient } from "react-query"
 import useCustomToast from "../../hooks/useCustomToast"
@@ -37,8 +39,10 @@ import Markdown from "react-markdown"
 import { GrFormNextLink } from "react-icons/gr"
 import { convertCheckpointToMessages } from "../../utils"
 import { IoCreateOutline } from "react-icons/io5"
+import { FaCheck, FaTimes } from "react-icons/fa"
 
 export interface ToolInput {
+  id: string
   name: string
   args: { [x: string]: any }
 }
@@ -47,6 +51,7 @@ export interface Message extends ChatMessage {
   toolCalls?: ToolInput[]
   member: string
   next?: string
+  interrupt?: boolean
 }
 
 const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
@@ -99,8 +104,14 @@ const stream = async (id: number, threadId: string, data: TeamChat) => {
   return res
 }
 
-const MessageBox = ({ message }: { message: Message }) => {
-  const { member, next, content, toolCalls } = message
+interface MessageBoxProps {
+  message: Message
+  onResume: (decision: InterruptDecision) => void
+}
+
+const MessageBox = ({ message, onResume }: MessageBoxProps) => {
+  const { member, next, content, toolCalls, interrupt } = message
+  const [decision, setDecision] = useState<InterruptDecision | null>(null)
   const hasTools = (toolCalls && toolCalls.length > 0) || false
   const memberComp =
     member === "user" ? (
@@ -111,18 +122,27 @@ const MessageBox = ({ message }: { message: Message }) => {
       <Tag colorScheme="red" fontWeight={"bold"}>
         Error
       </Tag>
+    ) : interrupt ? (
+      <Tag colorScheme="yellow" fontWeight={"bold"}>
+        Interrupt
+      </Tag>
     ) : (
       member
     )
-  
-  const isToolMessage = toolCalls && toolCalls.length > 0 || false
+
+  const onDecisionHandler = (decision: InterruptDecision) => {
+    setDecision(decision)
+    onResume(decision)
+  }
+
+  const isToolMessage = (toolCalls && toolCalls.length > 0) || false
   return (
     <VStack spacing={0} my={8}>
       <Container fontWeight={"bold"} display={"flex"} alignItems="center">
         {memberComp}
         {next && <Icon as={GrFormNextLink} mx={2} />}
         {next && next}
-        {hasTools && <Tag ml={4}>Tool</Tag>}
+        {hasTools && <Tag ml={4}>Skill</Tag>}
       </Container>
       <Container>
         <Wrap pt={2} gap={2}>
@@ -132,8 +152,30 @@ const MessageBox = ({ message }: { message: Message }) => {
                 <Tag>{toolCall.name}</Tag>
               </Tooltip>
             ))}
-          {!isToolMessage && typeof content === "string" && <Markdown>{content}</Markdown>}
+          {!isToolMessage && typeof content === "string" && (
+            <Markdown>{content}</Markdown>
+          )}
         </Wrap>
+        {!decision && interrupt && (
+          <ButtonGroup mt={4} variant={"outline"}>
+            <Button
+              leftIcon={<FaCheck />}
+              size="sm"
+              colorScheme="green"
+              onClick={() => onDecisionHandler("approved")}
+            >
+              Approve
+            </Button>
+            <Button
+              leftIcon={<FaTimes />}
+              size="sm"
+              colorScheme="red"
+              onClick={() => onDecisionHandler("rejected")}
+            >
+              Reject
+            </Button>
+          </ButtonGroup>
+        )}
       </Container>
     </VStack>
   )
@@ -258,61 +300,64 @@ const ChatTeam = () => {
         const { done: streamDone, value } = await reader.read()
         done = streamDone
         if (!done) {
-          buffer += new TextDecoder().decode(value)
-          let boundary = buffer.lastIndexOf("\n\n")
-          while (boundary !== -1) {
+          buffer = new TextDecoder().decode(value)
+          const chunks = buffer.split("\n\n")
+          for (const chunk of chunks) {
+            if (chunk === "") continue
             // Extract and parse the complete JSON string
-            const chunk = buffer.slice(0, boundary).trim()
-            buffer = buffer.slice(boundary + 2)
-            if (chunk.startsWith("data: ")) {
-              const jsonStr = chunk.slice(6) // Remove 'data: ' prefix
-              try {
-                const parsed = JSON.parse(jsonStr)
-                const newMessages: Message[] = []
+            const jsonStr = chunk.trim().slice(6) // Remove 'data: ' prefix
+            try {
+              const parsed = JSON.parse(jsonStr)
+              const newMessages: Message[] = []
+
+              if (!parsed) continue
 
-                if (!parsed) continue
+              if ("error" in parsed) {
+                newMessages.push({
+                  type: "ai",
+                  content: parsed.error,
+                  member: "error",
+                })
+              }
 
-                if ("error" in parsed) {
+              if ("task" in parsed) {
+                for (const task of parsed.task) {
+                  if (task.name === "ignore") continue
                   newMessages.push({
-                    type: "ai",
-                    content: parsed.error,
-                    member: "error",
+                    type: task.type,
+                    content: task.content,
+                    member: task.name,
+                    next: parsed.next,
                   })
                 }
-
-                if ("task" in parsed) {
-                  for (const task of parsed.task) {
-                    if (task.name === "ignore") continue
-                    newMessages.push({
-                      type: task.type,
-                      content: task.content,
-                      member: task.name,
-                      next: parsed.next,
-                    })
-                  }
-                } else if ("messages" in parsed) {
-                  for (const message of parsed.messages) {
-                    if (message.name === "ignore") continue
-                    newMessages.push({
-                      type: message.type,
-                      content: message.content,
-                      member: message.name,
-                      toolCalls: message.tool_calls,
-                    })
-                  }
+              } else if ("messages" in parsed) {
+                for (const message of parsed.messages) {
+                  if (message.name === "ignore") continue
+                  newMessages.push({
+                    type: message.type,
+                    content: message.content,
+                    member: message.name,
+                    toolCalls: message.tool_calls,
+                  })
                 }
-
-                setMessages((prev) => [...prev, ...newMessages])
-              } catch (error) {
-                console.error("Failed to parse messages:", error)
-                return showToast(
-                  "Something went wrong.",
-                  "Error parsing messages.",
-                  "error",
-                )
+              } else if ("interrupt" in parsed) {
+                newMessages.push({
+                  type: "ai",
+                  content: "Proceed?",
+                  member: "Interrupt",
+                  interrupt: true,
+                })
               }
+
+              setMessages((prev) => [...prev, ...newMessages])
+            } catch (error) {
+              console.error("Failed to parse messages:", error)
+              return showToast(
+                "Something went wrong.",
+                "Error parsing messages.",
+                "error",
+              )
             }
-            boundary = buffer.indexOf("\n\n")
           }
         }
       }
@@ -346,6 +391,14 @@ const ChatTeam = () => {
     setMessages([])
   }
 
+  const onResumeHandler = (decision: InterruptDecision) => {
+    // messages acts as a placeholder for consistency. It dont really have an effect for resuming.
+    mutation.mutate({
+      messages: [{ type: "human", content: decision }],
+      interrupt_decision: decision,
+    })
+  }
+
   return (
     <Box>
       <InputGroup as="form" onSubmit={onSubmit}>
@@ -367,10 +420,21 @@ const ChatTeam = () => {
       </InputGroup>
       <Box p={2} overflow={"auto"} height="72vh" my={2}>
         {messages.map((message, index) => (
-          <MessageBox key={index} message={message} />
+          <MessageBox
+            key={index}
+            message={message}
+            onResume={onResumeHandler}
+          />
         ))}
       </Box>
-      <Button leftIcon={<IoCreateOutline/>} position={"fixed"} right={0} bottom={0} margin={8} onClick={newChatHandler}>
+      <Button
+        leftIcon={<IoCreateOutline />}
+        position={"fixed"}
+        right={0}
+        bottom={0}
+        margin={8}
+        onClick={newChatHandler}
+      >
         New Chat
       </Button>
     </Box>
diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
index 0db0a053..77b4bedf 100644
--- a/frontend/src/utils.ts
+++ b/frontend/src/utils.ts
@@ -35,5 +35,18 @@ export const convertCheckpointToMessages = (checkpoint: any): Message[] => {
     } as Message)
   }
 
+  // If last message is a tool call, then next message should be to interrupt message
+  if (messages.length > 0) {
+    const lastMessage = messages[messages.length - 1];
+    if (lastMessage.toolCalls && lastMessage.toolCalls.length > 0) {
+      messages.push({
+        type: "ai",
+        content: "Proceed?",
+        member: "Interrupt",
+        interrupt: true
+      })
+    }
+  }
+
   return messages
 }