diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index a26addbe6..c25e4cc41 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -568,7 +568,12 @@ class PlayState extends MusicBeatSubState
 
     // Prepare the Conductor.
     Conductor.forceBPM(null);
-    Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset();
+
+    if (currentChart.offsets != null)
+    {
+      Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset();
+    }
+
     Conductor.mapTimeChanges(currentChart.timeChanges);
     Conductor.update((Conductor.beatLengthMs * -5) + startTimestamp);
 
diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx
index aef5e9feb..49d5593b0 100644
--- a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx
+++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx
@@ -92,7 +92,12 @@ class ChartEditorUploadChartDialog extends ChartEditorBaseDialog
     if (this.locked) return;
 
     this.lock();
+    // TODO / BUG: File filtering not working on mac finder dialog, so we don't use it for now
+    #if !mac
     FileUtil.browseForBinaryFile('Open Chart', [FileUtil.FILE_EXTENSION_INFO_FNFC], onSelectFile, onCancelBrowse);
+    #else
+    FileUtil.browseForBinaryFile('Open Chart', null, onSelectFile, onCancelBrowse);
+    #end
   }
 
   /**