diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 590a70dac..83b9270c8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Report a bug in PocketMine-MP (not plugins)
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
new file mode 100644
index 000000000..7bcf5f4c2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -0,0 +1,15 @@
+---
+name: Crash
+about: Report a crash in PocketMine-MP (not plugins)
+title: Server crashed
+labels: ''
+assignees: ''
+
+---
+
+<!--- submit crashdump files to https://crash.pmmp.io -->
+<!--- or, copy the data between ===BEGIN CRASH DUMP=== and ===END CRASH DUMP and paste it on a site like https://pastebin.com -->
+Link to crashdump: 
+
+<!--- write additional information about the crash to help us find the problem -->
+### Additional comments (optional)