diff --git a/src/composables/useMarket.ts b/src/composables/useMarket.ts
index 4095ec9..3d6bfb1 100644
--- a/src/composables/useMarket.ts
+++ b/src/composables/useMarket.ts
@@ -24,6 +24,7 @@ export function useMarket() {
   const loadMarket = async (naddr: string) => {
     try {
       isLoading.value = true
+      marketStore.setLoading(true)
       error.value = null
       
       console.log('Loading market with naddr:', naddr)
@@ -45,6 +46,7 @@ export function useMarket() {
       // Don't throw error, let the UI handle it gracefully
     } finally {
       isLoading.value = false
+      marketStore.setLoading(false)
     }
   }
   
diff --git a/src/pages/Market.vue b/src/pages/Market.vue
index ef5fc30..e9c3ccf 100644
--- a/src/pages/Market.vue
+++ b/src/pages/Market.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container mx-auto px-4 py-8">
     <!-- Loading State -->
-    <div v-if="marketStore.isLoading || market.isLoading" class="flex justify-center items-center min-h-64">
+    <div v-if="marketStore.isLoading" class="flex justify-center items-center min-h-64">
       <div class="flex flex-col items-center space-y-4">
         <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
         <p class="text-gray-600">Loading market...</p>