diff --git a/src/components/Items/Question/Body.vue b/src/components/Items/Question/Body.vue
index e731b7ba..7d0d1974 100644
--- a/src/components/Items/Question/Body.vue
+++ b/src/components/Items/Question/Body.vue
@@ -275,8 +275,15 @@ export default {
   ) {
       return [
         { 
-          "h-4 sm:h-5": optionText == "" && !this.isImagePresentAtOptionIndex(optionIndex),
-          "h-4 sm:h-5": optionText != "" && !this.isImagePresentAtOptionIndex(optionIndex),
+          "h-4 sm:h-5": (
+            (
+              optionText == "" && !this.isImagePresentAtOptionIndex(optionIndex)
+            ) 
+              || 
+            (
+              optionText != "" && !this.isImagePresentAtOptionIndex(optionIndex)
+            )
+          ),
           "h-full": this.isImagePresentAtOptionIndex(optionIndex),
         }, 
         "flex content-center"
diff --git a/src/pages/Editor.vue b/src/pages/Editor.vue
index 12ccdb68..d115d4f5 100644
--- a/src/pages/Editor.vue
+++ b/src/pages/Editor.vue
@@ -1014,6 +1014,7 @@ export default {
       if (this.imageUploaderMode == "question") return this.itemImage;
       if (this.imageUploaderMode == "option" && this.imageUploaderOptionIndex != -1)
         return this.currentOptionImage;
+      return null
     },
     /**
      * URL of the image present for the current item