diff --git a/api/api.go b/api/api.go
index 86cf0eb..54b72d7 100644
--- a/api/api.go
+++ b/api/api.go
@@ -20,7 +20,7 @@ func New(sockPath string) (*Client, error) {
 	}
 
 	out := &Client{
-		client: client.New(conn, codec.JSON),
+		client: client.New(conn, codec.Default),
 	}
 	return out, nil
 }
diff --git a/socket.go b/socket.go
index 01070fd..715a460 100644
--- a/socket.go
+++ b/socket.go
@@ -112,7 +112,7 @@ func startSocket(dev *infinitime.Device) error {
 		return err
 	}
 
-	go srv.Serve(ln, codec.JSON)
+	go srv.Serve(ln, codec.Default)
 
 	// Log socket start
 	log.Info().Str("path", k.String("socket.path")).Msg("Started control socket")