diff --git a/src/Core.js b/src/Core.js
index a4838c0..5238e7f 100644
--- a/src/Core.js
+++ b/src/Core.js
@@ -3,19 +3,19 @@ import { useSelector, useDispatch } from "react-redux";
 import { Box, Button, Clock } from "grommet";
 
 import { setPlugin, selectCore } from "./coreSlice";
-import * as plugins from "./plugins";
+import plugins from "./plugins";
 
 function Core() {
 	const coreState = useSelector(selectCore);
 	const dispatch = useDispatch();
-	const plugin = plugins.default[coreState.plugin];
+	const plugin = plugins[coreState.plugin];
 	const props = {
 		data: coreState.data,
 		close: () => dispatch(setPlugin(false))
 	};
 	const dummyButtons = ["Maps", "Home Devices", "Phone"];
 	return <>
-		{plugin ? plugin(props) : (
+		{plugin ? React.createElement(plugin, props, null) : (
 			<Box
 				align="center"
 				background="light-1"
diff --git a/src/WebSocket.js b/src/WebSocket.js
index cc4550a..1612a5a 100644
--- a/src/WebSocket.js
+++ b/src/WebSocket.js
@@ -17,8 +17,8 @@ function WebSocketProvider({ children }) {
 		socket = io.connect(WS_BASE);
 
 		socket.on("switchPlugin", (payload) => {
+			dispatch(setData(payload.data || {}));
 			dispatch(setPlugin(payload.plugin));
-			dispatch(setData(payload.data));
 			if (payload.time) {
 				setTimeout(() => {
 					dispatch(setData({}));