diff --git a/libnymea-core/jsonrpc/statehandler.cpp b/libnymea-core/jsonrpc/statehandler.cpp
index 64821d0e..b428148b 100644
--- a/libnymea-core/jsonrpc/statehandler.cpp
+++ b/libnymea-core/jsonrpc/statehandler.cpp
@@ -54,6 +54,7 @@ StateHandler::StateHandler(QObject *parent) :
     JsonHandler(parent)
 {
     registerEnum<Types::Unit>();
+    registerEnum<Types::IOType>();
     registerObject<State>();
     registerObject<StateType>();
 
diff --git a/plugins/mock/integrationpluginmock.cpp b/plugins/mock/integrationpluginmock.cpp
index ef584c44..e93aa0a0 100644
--- a/plugins/mock/integrationpluginmock.cpp
+++ b/plugins/mock/integrationpluginmock.cpp
@@ -133,6 +133,11 @@ void IntegrationPluginMock::discoverThings(ThingDiscoveryInfo *info)
 void IntegrationPluginMock::setupThing(ThingSetupInfo *info)
 {
     if (info->thing()->thingClassId() == mockThingClassId || info->thing()->thingClassId() == autoMockThingClassId) {
+        if (m_daemons.contains(info->thing())) {
+            // We already have a daemon, seem's we're reconfiguring
+            delete m_daemons.take(info->thing());
+        }
+
         bool async = false;
         bool broken = false;
         if (info->thing()->thingClassId() == mockThingClassId) {