diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue
index 7b80bbeab4..7e5879712f 100644
--- a/website/client/src/components/challenges/challengeDetail.vue
+++ b/website/client/src/components/challenges/challengeDetail.vue
@@ -18,7 +18,10 @@
           <div>
             <span class="mr-1 ml-0 d-block">
               <strong v-once>{{ $t('createdBy') }}:</strong>
-              <user-link
+              <span v-if="challenge.leader === null">
+                {{ $t('noChallengeOwner') }}
+              </span>
+              <user-link v-else
                 class="mx-1"
                 :user="challenge.leader"
               />
diff --git a/website/client/src/components/challenges/challengeItem.vue b/website/client/src/components/challenges/challengeItem.vue
index b3a1fd61e0..7bdf00bbc2 100644
--- a/website/client/src/components/challenges/challengeItem.vue
+++ b/website/client/src/components/challenges/challengeItem.vue
@@ -43,7 +43,14 @@
         >
           <div class="owner-item">
             <strong>{{ $t('createdBy') }}:</strong>
+            <span
+              v-if="challenge.leader === null"
+              class="mx-1"
+            >
+              {{ $t('noChallengeOwner') }}
+            </span>
             <user-link
+              v-else
               class="mx-1"
               :user="challenge.leader"
             />
diff --git a/website/client/src/store/getters/tasks.js b/website/client/src/store/getters/tasks.js
index a8e81ff545..0390a5342e 100644
--- a/website/client/src/store/getters/tasks.js
+++ b/website/client/src/store/getters/tasks.js
@@ -44,7 +44,8 @@ export function canDelete (store) {
       && group.leader._id === userId);
     const isUserGroupManager = group && (group.managers
         && Boolean(group.managers[userId]));
-    const isUserChallenge = userId === (challenge && challenge.leader.id);
+    const isUserChallenge = userId === (challenge
+      && challenge.leader !== null && challenge.leader.id);
 
     let isUserCanDeleteTask = onUserDashboard;
 
@@ -81,7 +82,8 @@ export function canEdit (store) {
       && group.leader._id === userId);
     const isUserGroupManager = group && (group.managers
         && Boolean(group.managers[userId]));
-    const isUserChallenge = userId === (challenge && challenge.leader.id);
+    const isUserChallenge = userId === (challenge
+      && challenge.leader !== null && challenge.leader.id);
 
 
     switch (taskCategory) {