                 }
             }
 
-            guard self.eptSafeContinue else {
-                self.safeCallbackOverwriteAllEvents()
+            // This check will halt the loop in case an attempt was made to overwrite events while this
+            // thread was running. This prevents the relatively expensive sort from being executed.
+            if let overwriteTempData = self.eptTempData {
+                self.forceSyncOverwriteAllEvents(overwriteData: overwriteTempData)
                 return
             }
 


    // MARK: - HELPER/PRIVATE FUNCTIONS -

    private func safeCallbackOverwriteAllEvents() {
        DispatchQueue.main.sync {
            eptRunning = false
            overwriteAllEvents(withData: eptTempData)
        }
    }


                for (_, dayViewCell) in self.dayViewCells where !sortedChangedDays.contains(dayViewCell.date) {
                    dayViewCell.setNeedsLayout()
                }

                // If an attempt was made to overwrite events while the above process was running
                // this if-check will notice this and recall overwriteAllEvents
                if let overwriteTempData = self.eptTempData {
                    self.overwriteAllEvents(withData: overwriteTempData)
                }
            }
        }
    }
