diff --git a/pythonflow/core.py b/pythonflow/core.py
index bdb032f..e347cdf 100644
--- a/pythonflow/core.py
+++ b/pythonflow/core.py
@@ -20,6 +20,7 @@
 import functools
 import importlib
 import operator
+import threading
 import traceback
 import uuid
 
@@ -34,16 +35,17 @@ def __init__(self):
         self.operations = {}
         self.dependencies = []
 
-    default_graph = None
+    _globals = threading.local()
 
     def __enter__(self):
-        assert self.default_graph is None, "cannot have more than one default graph"
-        Graph.default_graph = self
+        assert getattr(self._globals, 'default_graph', None) is  None, \
+            "cannot have more than one default graph"
+        Graph._globals.default_graph = self
         return self
 
     def __exit__(self, *args):
-        assert self.default_graph is self
-        Graph.default_graph = None
+        assert self._globals.default_graph is self
+        Graph._globals.default_graph = None
 
     def normalize_operation(self, operation):  # pylint:disable=W0621
         """
@@ -183,7 +185,7 @@ def get_active_graph(graph=None):
         ValueError
             If no `Graph` instance can be obtained.
         """
-        graph = graph or Graph.default_graph
+        graph = graph or Graph._globals.default_graph
         if not graph:
             raise ValueError("`graph` must be given explicitly or a default graph must be set")
         return graph
diff --git a/tests/test_pythonflow.py b/tests/test_pythonflow.py
index 7d1eb49..9b10d52 100644
--- a/tests/test_pythonflow.py
+++ b/tests/test_pythonflow.py
@@ -16,6 +16,7 @@
 import pickle
 import random
 import tempfile
+import threading
 import uuid
 
 import pytest
@@ -535,3 +536,18 @@ def test_placeholder_with_kwargs():
         b, c = a
 
     assert graph([b, c], {a: [1, 2]}) == (1, 2)
+
+
+def test_thread_compatibility():
+    def work(event):
+        with pf.Graph() as graph:
+            event.wait()
+    event = threading.Event()
+    thread = threading.Thread(target=work, args=(event,))
+    thread.start()
+    try:
+        with pf.Graph() as graph:
+            event.set()
+    except AssertionError as e:
+        event.set()
+        raise e
diff --git a/version.json b/version.json
index e8cce6b..b68c2af 100644
--- a/version.json
+++ b/version.json
@@ -1,7 +1,7 @@
 {
     "name": "pythonflow",
     "description": "Dataflow programming for python",
-    "version": "0.2.3",
+    "version": "0.3.0",
     "author": "Till Hoffmann",
     "author_email": "till@spotify.com",
     "license": "License :: OSI Approved :: Apache Software License",