diff --git a/backend/src/uxbox/services/mutations/profile.clj b/backend/src/uxbox/services/mutations/profile.clj
index b2ed333fe..5e30d5108 100644
--- a/backend/src/uxbox/services/mutations/profile.clj
+++ b/backend/src/uxbox/services/mutations/profile.clj
@@ -10,7 +10,7 @@
 (ns uxbox.services.mutations.profile
   (:require
    [clojure.spec.alpha :as s]
-   [clojure.string :as str]
+   [cuerdas.core :as str]
    [datoteka.core :as fs]
    [promesa.core :as p]
    [promesa.exec :as px]
@@ -174,8 +174,10 @@
             photo (upload-photo conn params)]
 
       ;; Schedule deletion of old photo
-      (tasks/schedule! conn {:name "remove-media"
-                             :props {:path (:photo profile)}})
+      (when (and (string? (:photo profile))
+                 (not (str/blank? (:photo profile))))
+        (tasks/schedule! conn {:name "remove-media"
+                               :props {:path (:photo profile)}}))
       ;; Save new photo
       (update-profile-photo conn profile-id photo))))
 
diff --git a/backend/src/uxbox/tasks/remove_media.clj b/backend/src/uxbox/tasks/remove_media.clj
index 7e93adf70..5f5b1510b 100644
--- a/backend/src/uxbox/tasks/remove_media.clj
+++ b/backend/src/uxbox/tasks/remove_media.clj
@@ -18,7 +18,7 @@
    [uxbox.util.storage :as ust]
    [vertx.util :as vu]))
 
-(s/def ::path ::us/string)
+(s/def ::path ::us/not-empty-string)
 (s/def ::props
   (s/keys :req-un [::path]))