diff --git a/static/js/market.js b/static/js/market.js
index 0d823e9..3cf9b90 100644
--- a/static/js/market.js
+++ b/static/js/market.js
@@ -222,7 +222,6 @@ const market = async () => {
             })
           })
         await Promise.resolve(sub)
-        this.$q.loading.hide()
         this.stalls = await Array.from(stalls.values())
 
         this.products = Array.from(products.values()).map(obj => {
@@ -234,6 +233,7 @@ const market = async () => {
           }
           return obj
         })
+        this.$q.loading.hide()
         pool.close(relays)
         return
       },
diff --git a/templates/nostrmarket/market.html b/templates/nostrmarket/market.html
index a5ebeb3..baa9715 100644
--- a/templates/nostrmarket/market.html
+++ b/templates/nostrmarket/market.html
@@ -57,7 +57,7 @@
                   <q-item-section avatar>
                     <q-avatar>
                       <img
-                        v-if="profiles.get(pub) && profiles.get(pub).picture"
+                        v-if="profiles.get(pub) && profiles.get(pub)?.picture"
                         :src="profiles.get(pub).picture"
                       />
                       <img
@@ -68,7 +68,7 @@
                   </q-item-section>
                   <q-item-section>
                     <q-item-label
-                      v-if="profiles.get(pub) && profiles.get(pub).name"
+                      v-if="profiles.get(pub) && profiles.get(pub)?.name"
                       >{{ profiles.get(pub).name }}</q-item-label
                     >
                     <q-item-label v-else