diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab41b8917..135c75c8a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Fix panic upon usage of postgres ramps due to incompatbility with tokio and async-std runtime. [#641](https://github.com/tremor-rs/tremor-runtime/pull/641)
+
 ## 0.9.3
 
 ### New features
diff --git a/Cargo.lock b/Cargo.lock
index ed29612cd2..f6c5c09442 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -222,6 +222,7 @@ dependencies = [
  "futures-lite",
  "num_cpus",
  "once_cell",
+ "tokio 0.3.4",
 ]
 
 [[package]]
@@ -5285,6 +5286,7 @@ dependencies = [
  "libc",
  "memchr",
  "mio 0.7.6",
+ "num_cpus",
  "pin-project-lite 0.2.0",
  "slab",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 5312c189a0..aed08caea4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ async-channel = "1"
 async-compat = "0.1"
 async-compression = {version = "0.3", features = ["xz", "futures-bufread", "stream"]}
 async-io = "1.3"
-async-std = {version = "1.7.0", features = ["unstable", "attributes"]}
+async-std = {version = "1.7.0", features = ["unstable", "attributes", "tokio03"]}
 async-trait = "0.1"
 async-tungstenite = {version = "0.10.0", features = ["async-std-runtime"]}
 base64 = "0.13"