diff --git a/include/villas/atomic.h b/include/villas/atomic.h
index b23b5487f..0eba94d48 100644
--- a/include/villas/atomic.h
+++ b/include/villas/atomic.h
@@ -29,7 +29,7 @@
 
 typedef std::atomic_int atomic_int;
 typedef std::atomic_size_t atomic_size_t;
-typedef std::atomic_int atomic_state;
+typedef std::atomic<enum state> atomic_state;
 
 #else