diff --git a/packages/ui/src/components/emojis/emoji-browser-items.tsx b/packages/ui/src/components/emojis/emoji-browser-items.tsx
index ae2869f1..80e6335b 100644
--- a/packages/ui/src/components/emojis/emoji-browser-items.tsx
+++ b/packages/ui/src/components/emojis/emoji-browser-items.tsx
@@ -1,6 +1,6 @@
 import { EmojiPickerItemsRow } from '@colanode/client/types';
 import { EmojiPickerItem } from '@colanode/ui/components/emojis/emoji-picker-item';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface EmojiBrowserItemsProps {
   row: EmojiPickerItemsRow;
@@ -8,7 +8,7 @@ interface EmojiBrowserItemsProps {
 }
 
 export const EmojiBrowserItems = ({ row, style }: EmojiBrowserItemsProps) => {
-  const emojiListQuery = useLiveQuery({
+  const emojiListQuery = useQuery({
     type: 'emoji.list',
     category: row.category,
     page: row.page,
diff --git a/packages/ui/src/components/emojis/emoji-browser.tsx b/packages/ui/src/components/emojis/emoji-browser.tsx
index 690d0fe1..19b540de 100644
--- a/packages/ui/src/components/emojis/emoji-browser.tsx
+++ b/packages/ui/src/components/emojis/emoji-browser.tsx
@@ -9,12 +9,12 @@ import {
   ScrollViewport,
   ScrollBar,
 } from '@colanode/ui/components/ui/scroll-area';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 const EMOJIS_PER_ROW = 10;
 
 export const EmojiBrowser = () => {
-  const emojiCategoryListQuery = useLiveQuery({
+  const emojiCategoryListQuery = useQuery({
     type: 'emoji.category.list',
   });
 
diff --git a/packages/ui/src/components/emojis/emoji-element.tsx b/packages/ui/src/components/emojis/emoji-element.tsx
index 209be1fd..123f30b4 100644
--- a/packages/ui/src/components/emojis/emoji-element.tsx
+++ b/packages/ui/src/components/emojis/emoji-element.tsx
@@ -1,7 +1,7 @@
 import { ShieldQuestionMark } from 'lucide-react';
 
 import { useApp } from '@colanode/ui/contexts/app';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 import { cn } from '@colanode/ui/lib/utils';
 
 interface EmojiElementProps {
@@ -21,7 +21,7 @@ const EmojiElementWeb = ({ id, className, onClick }: EmojiElementProps) => {
 };
 
 const EmojiElementDesktop = ({ id, className, onClick }: EmojiElementProps) => {
-  const svgQuery = useLiveQuery({
+  const svgQuery = useQuery({
     type: 'emoji.svg.get',
     id,
   });
diff --git a/packages/ui/src/components/emojis/emoji-search.tsx b/packages/ui/src/components/emojis/emoji-search.tsx
index ed0648eb..9c08f9fd 100644
--- a/packages/ui/src/components/emojis/emoji-search.tsx
+++ b/packages/ui/src/components/emojis/emoji-search.tsx
@@ -4,14 +4,14 @@ import {
   ScrollViewport,
   ScrollBar,
 } from '@colanode/ui/components/ui/scroll-area';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface EmojiSearchProps {
   query: string;
 }
 
 export const EmojiSearch = ({ query }: EmojiSearchProps) => {
-  const emojiSearchQuery = useLiveQuery({
+  const emojiSearchQuery = useQuery({
     type: 'emoji.search',
     query,
     count: 100,
diff --git a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
index cf352f57..68b27978 100644
--- a/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
+++ b/packages/ui/src/components/emojis/emoji-skin-tone-selector.tsx
@@ -7,7 +7,7 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from '@colanode/ui/components/ui/popover';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 import { defaultEmojis } from '@colanode/ui/lib/assets';
 
 interface EmojiSkinToneSelectorProps {
@@ -21,7 +21,7 @@ export const EmojiSkinToneSelector = ({
 }: EmojiSkinToneSelectorProps) => {
   const [open, setOpen] = useState<boolean>(false);
 
-  const emojiGetQuery = useLiveQuery({
+  const emojiGetQuery = useQuery({
     type: 'emoji.get',
     id: defaultEmojis.hand,
   });
diff --git a/packages/ui/src/components/icons/icon-browser-items.tsx b/packages/ui/src/components/icons/icon-browser-items.tsx
index 112c0008..0289d99d 100644
--- a/packages/ui/src/components/icons/icon-browser-items.tsx
+++ b/packages/ui/src/components/icons/icon-browser-items.tsx
@@ -1,6 +1,6 @@
 import { IconPickerItemsRow } from '@colanode/client/types';
 import { IconPickerItem } from '@colanode/ui/components/icons/icon-picker-item';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface IconBrowserItemsProps {
   row: IconPickerItemsRow;
@@ -8,7 +8,7 @@ interface IconBrowserItemsProps {
 }
 
 export const IconBrowserItems = ({ row, style }: IconBrowserItemsProps) => {
-  const iconListQuery = useLiveQuery({
+  const iconListQuery = useQuery({
     type: 'icon.list',
     category: row.category,
     page: row.page,
diff --git a/packages/ui/src/components/icons/icon-browser.tsx b/packages/ui/src/components/icons/icon-browser.tsx
index 1ada3160..3100045d 100644
--- a/packages/ui/src/components/icons/icon-browser.tsx
+++ b/packages/ui/src/components/icons/icon-browser.tsx
@@ -9,12 +9,12 @@ import {
   ScrollViewport,
   ScrollBar,
 } from '@colanode/ui/components/ui/scroll-area';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 const ICONS_PER_ROW = 10;
 
 export const IconBrowser = () => {
-  const iconCategoryListQuery = useLiveQuery({
+  const iconCategoryListQuery = useQuery({
     type: 'icon.category.list',
   });
 
diff --git a/packages/ui/src/components/icons/icon-element.tsx b/packages/ui/src/components/icons/icon-element.tsx
index 26798c00..8b28d034 100644
--- a/packages/ui/src/components/icons/icon-element.tsx
+++ b/packages/ui/src/components/icons/icon-element.tsx
@@ -1,7 +1,7 @@
 import { ShieldQuestionMark } from 'lucide-react';
 
 import { useApp } from '@colanode/ui/contexts/app';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 import { cn } from '@colanode/ui/lib/utils';
 
 interface IconElementProps {
@@ -20,7 +20,7 @@ const IconElementWeb = ({ id, className }: IconElementProps) => {
 };
 
 const IconElementDesktop = ({ id, className }: IconElementProps) => {
-  const svgQuery = useLiveQuery(
+  const svgQuery = useQuery(
     {
       type: 'icon.svg.get',
       id,
diff --git a/packages/ui/src/components/icons/icon-search.tsx b/packages/ui/src/components/icons/icon-search.tsx
index dbae8267..a99f221a 100644
--- a/packages/ui/src/components/icons/icon-search.tsx
+++ b/packages/ui/src/components/icons/icon-search.tsx
@@ -4,14 +4,14 @@ import {
   ScrollViewport,
   ScrollBar,
 } from '@colanode/ui/components/ui/scroll-area';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface IconSearchProps {
   query: string;
 }
 
 export const IconSearch = ({ query }: IconSearchProps) => {
-  const iconSearchQuery = useLiveQuery({
+  const iconSearchQuery = useQuery({
     type: 'icon.search',
     query,
     count: 100,
diff --git a/packages/ui/src/components/messages/message-quick-reaction.tsx b/packages/ui/src/components/messages/message-quick-reaction.tsx
index a237170f..15ff572e 100644
--- a/packages/ui/src/components/messages/message-quick-reaction.tsx
+++ b/packages/ui/src/components/messages/message-quick-reaction.tsx
@@ -1,5 +1,5 @@
 import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';
-import { useLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface MessageQuickReactionProps {
   emoji: string;
@@ -10,7 +10,7 @@ export const MessageQuickReaction = ({
   emoji,
   onClick,
 }: MessageQuickReactionProps) => {
-  const emojiGetQuery = useLiveQuery({
+  const emojiGetQuery = useQuery({
     type: 'emoji.get',
     id: emoji,
   });
diff --git a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
index 605ddcec..3bc76b17 100644
--- a/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
+++ b/packages/ui/src/components/messages/message-reaction-count-tooltip-content.tsx
@@ -3,7 +3,7 @@ import { eq, inArray, useLiveQuery } from '@tanstack/react-db';
 import { NodeReactionCount, LocalMessageNode } from '@colanode/client/types';
 import { EmojiElement } from '@colanode/ui/components/emojis/emoji-element';
 import { useWorkspace } from '@colanode/ui/contexts/workspace';
-import { useLiveQuery as useColanodeLiveQuery } from '@colanode/ui/hooks/use-live-query';
+import { useQuery } from '@colanode/ui/hooks/use-query';
 
 interface MessageReactionCountTooltipContentProps {
   message: LocalMessageNode;
@@ -16,7 +16,7 @@ export const MessageReactionCountTooltipContent = ({
 }: MessageReactionCountTooltipContentProps) => {
   const workspace = useWorkspace();
 
-  const emojiGetQuery = useColanodeLiveQuery({
+  const emojiGetQuery = useQuery({
     type: 'emoji.get.by.skin.id',
     id: reactionCount.reaction,
   });