diff --git a/Cargo.lock b/Cargo.lock
index 85f06e1..891a08e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,6 +79,19 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-compat"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "once_cell",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "async-executor"
 version = "1.4.1"
@@ -515,6 +528,7 @@ name = "diflouroborane"
 version = "0.3.2"
 dependencies = [
  "async-channel",
+ "async-compat",
  "async-rustls",
  "async-trait",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 85541ca..a66d9eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ rsasl = "1.4.0"
 #rsasl = { path = "../../rsasl" }
 
 rumqttc = { version = "0.10", features = ["url"] }
+async-compat = "0.2.1"
 url = "2.2.2"
 
 #mlua = { version = "0.4", features = ["async", "luajit"] }
diff --git a/src/actor.rs b/src/actor.rs
index 0122512..76ad85e 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -9,6 +9,7 @@ use futures::{future::BoxFuture, Stream};
 use futures::channel::mpsc;
 use futures_signals::signal::Signal;
 use rumqttc::{AsyncClient, ConnectionError, Event, Incoming, MqttOptions};
+use async_compat::CompatExt;
 
 use crate::db::machine::MachineState;
 use crate::config::Config;
@@ -175,12 +176,12 @@ pub fn load(log: &Logger, config: &Config) -> Result<(ActorMap, Vec<Actor>)> {
         }
 
         Ok(eventloop)
-    })?;
+    }.compat())?;
     let dlog = log.clone();
     smol::spawn(async move {
         let mut fault = false;
         loop {
-            match eventloop.poll().await {
+            match eventloop.poll().compat().await {
                 Ok(_) => {
                     fault = false;
                     // TODO: Handle incoming MQTT messages
@@ -213,7 +214,7 @@ pub fn load(log: &Logger, config: &Config) -> Result<(ActorMap, Vec<Actor>)> {
                 }
             }
         }
-    }).detach();
+    }.compat()).detach();
 
     let actuators = config.actors.iter()
         .map(|(k,v)| (k, load_single(log, k, &v.module, &v.params, mqtt.clone())))