diff --git a/backend/src/schema/resolvers/helpers/events.js b/backend/src/schema/resolvers/helpers/events.js
index 41f8b0d74..bb573021f 100644
--- a/backend/src/schema/resolvers/helpers/events.js
+++ b/backend/src/schema/resolvers/helpers/events.js
@@ -1,29 +1,32 @@
 import { UserInputError } from 'apollo-server'
 
 export const validateEventParams = (params) => {
+  let locationName = null
   if (params.postType && params.postType === 'Event') {
     const { eventInput } = params
     validateEventDate(eventInput.eventStart)
     params.eventStart = eventInput.eventStart
 
-    validateEventEnd(eventInput.eventStart, eventInput.eventEnd)
-    params.eventEnd = eventInput.eventEnd
+    if (eventInput.eventEnd) {
+      validateEventEnd(eventInput.eventStart, eventInput.eventEnd)
+      params.eventEnd = eventInput.eventEnd
+    } else {
+      params.eventEnd = null 
+    }
 
     if (eventInput.eventLocationName && !eventInput.eventVenue) {
       throw new UserInputError('Event venue must be present if event location is given!')
     }
     params.eventVenue = eventInput.eventVenue
-    params.eventLocationName = eventInput.eventLocationName
+    params.eventLocationName = eventInput.eventLocationName && eventInput.eventLocationName.trim()
+    if (params.eventLocationName) {
+      locationName = params.eventLocationName
+    } else {
+      params.eventLocationName = null
+    }
     params.eventIsOnline = !!eventInput.eventIsOnline
   }
   delete params.eventInput
-  let locationName
-  if (params.eventLocationName.trim()) {
-    locationName = params.eventLocationName
-  } else {
-    params.eventLocationName = null
-    locationName = null
-  }
   return locationName
 }
 
@@ -38,7 +41,6 @@ const validateEventDate = (dateString) => {
 }
 
 const validateEventEnd = (start, end) => {
-  if (end === null) return
   const endDate = new Date(end)
   if (endDate.toString() === 'Invalid Date')
     throw new UserInputError('Event end date must be a valid date!')