diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
index 644e10f96b..11fddeefa2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
@@ -10,6 +10,12 @@ open class QuestContent : RealmObject(), Item {
 
     @PrimaryKey
     internal var key: String = ""
+    set(value) {
+        field = value
+        drop?.key = value
+        colors?.key = value
+        boss?.key = value
+    }
     internal var text: String = ""
     var notes: String = ""
     internal var value: Int = 0
@@ -73,8 +79,8 @@ open class QuestContent : RealmObject(), Item {
         this.text = text
     }
 
-    fun setValue(value: Int?) {
-        this.value = value!!
+    fun setValue(value: Int) {
+        this.value = value
     }
 
     fun setKey(key: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index db9b94ab25..c17f48dead 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
@@ -179,11 +179,13 @@ class QuestDetailFragment : BaseMainFragment() {
                         }
                     }
                 }
-
+                questParticipantList?.addView(participantView)
             } else {
                 statusTextView?.visibility = View.GONE
+                if (participant.participatesInQuest == true) {
+                    questParticipantList?.addView(participantView)
+                }
             }
-            questParticipantList?.addView(participantView)
             if (quest?.active == true || participant.participatesInQuest == true) {
                 participantCount += 1
             }