diff --git a/src/uxbox/ui/settings/profile.cljs b/src/uxbox/ui/settings/profile.cljs
index 4e2fb0817d..5e09497e59 100644
--- a/src/uxbox/ui/settings/profile.cljs
+++ b/src/uxbox/ui/settings/profile.cljs
@@ -130,7 +130,7 @@
               (rs/emit! (udu/update-photo file))
               (dom/clean-value! target)))]
     (let [{:keys [photo]} (rum/react profile-l)
-          photo (if (str/empty? photo)
+          photo (if (or (str/empty? photo) (nil? photo))
                   "images/avatar.jpg"
                   photo)]
     (html
diff --git a/src/uxbox/ui/users.cljs b/src/uxbox/ui/users.cljs
index e7ef8ae908..e2fcd08b0c 100644
--- a/src/uxbox/ui/users.cljs
+++ b/src/uxbox/ui/users.cljs
@@ -58,10 +58,9 @@
   [own]
   (let [profile (rum/react profile-l)
         local (:rum/local own)
-        photo (if (str/empty? (:photo profile))
+        photo (if (str/empty? (:photo profile ""))
                 "/images/avatar.jpg"
                 (:photo profile))]
-
     (html
      [:div.user-zone {:on-mouse-enter #(swap! local assoc :open true)
                       :on-mouse-leave #(swap! local assoc :open false)}