diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
index 60428f10..7b8e6cfa 100644
--- a/embassy/Cargo.toml
+++ b/embassy/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
 edition = "2018"
 
 [features]
-std = []
+std = ["futures/std"]
 
 [dependencies]
 defmt = "0.1.0"
diff --git a/embassy/src/io/error.rs b/embassy/src/io/error.rs
index 2f1d4810..ee3263d5 100644
--- a/embassy/src/io/error.rs
+++ b/embassy/src/io/error.rs
@@ -110,8 +110,8 @@ impl From<io::Error> for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
+//#[cfg(feature = "std")]
+//impl std::error::Error for Error {}
 
 /*
 impl From<smoltcp::Error> for Error {
diff --git a/embassy/src/lib.rs b/embassy/src/lib.rs
index 92ad7742..3b9aa814 100644
--- a/embassy/src/lib.rs
+++ b/embassy/src/lib.rs
@@ -1,4 +1,4 @@
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
 #![feature(slice_fill)]
 #![feature(generic_associated_types)]
 #![feature(const_fn)]