diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 88c87f3d2..00b7dcd74 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -1803,7 +1803,8 @@
   (and
    (or
     (empty? properties)
-    (property-file/properties-hidden? properties))
+    (and (not (config/db-based-graph? (state/get-current-repo)))
+         (property-file/properties-hidden? properties)))
 
    (empty? title)
 
diff --git a/src/main/frontend/handler/property/file.cljs b/src/main/frontend/handler/property/file.cljs
index e7db1046a..5718c4f67 100644
--- a/src/main/frontend/handler/property/file.cljs
+++ b/src/main/frontend/handler/property/file.cljs
@@ -50,8 +50,7 @@
 (defn properties-hidden?
   [properties]
   (and (seq properties)
-       (let [ks (if (config/db-based-graph? (state/get-current-repo))
-                  (map #(:block/name (db/entity [:block/uuid %])) (keys properties))
-                  (map (comp keyword string/lower-case name) (remove nil? (keys properties))))
+       (let [ks (map (comp keyword string/lower-case name)
+                     (keys properties))
              hidden-properties-set (file-property-handler/hidden-properties)]
          (every? hidden-properties-set ks))))