diff --git a/mods/src/death/death.cpp b/mods/src/death/death.cpp
index b360b8b1..72487e37 100644
--- a/mods/src/death/death.cpp
+++ b/mods/src/death/death.cpp
@@ -62,7 +62,7 @@ static void LocalPlayer_actuallyHurt_injection(unsigned char *player, int32_t da
 // Init
 void init_death() {
     // Death Messages
-    if (feature_has("Implement Death Messages", server_enabled)) {
+    if (feature_has("Implement Death Messages", server_auto)) {
         patch_address(ServerPlayer_actuallyHurt_vtable_addr, (void *) ServerPlayer_actuallyHurt_injection);
         patch_address(LocalPlayer_actuallyHurt_vtable_addr, (void *) LocalPlayer_actuallyHurt_injection);
     }
diff --git a/mods/src/server/server.cpp b/mods/src/server/server.cpp
index 3c69c0a9..90318b43 100644
--- a/mods/src/server/server.cpp
+++ b/mods/src/server/server.cpp
@@ -58,6 +58,7 @@ static ServerProperties &get_server_properties() {
 #define DEFAULT_WORLD_NAME "world"
 #define DEFAULT_MAX_PLAYERS "4"
 #define DEFAULT_WHITELIST "false"
+#define DEFAULT_DEATH_MESSAGES "false"
 
 // Get World Name
 static std::string get_world_name() {
@@ -423,6 +424,9 @@ static const char *get_features() {
         if (get_server_properties().get_bool("force-mob-spawning", DEFAULT_FORCE_MOB_SPAWNING)) {
             features += "Force Mob Spawning|";
         }
+        if (get_server_properties().get_bool("death-messages", DEFAULT_DEATH_MESSAGES)) {
+            features += "Implement Death Messages|";
+        }
     }
     return features.c_str();
 }
@@ -469,6 +473,8 @@ static void server_init() {
         properties_file_output << "max-players=" DEFAULT_MAX_PLAYERS "\n";
         properties_file_output << "# Enable Whitelist\n";
         properties_file_output << "whitelist=" DEFAULT_WHITELIST "\n";
+        properties_file_output << "# Enable Death Messages\n";
+        properties_file_output << "death-messages=" DEFAULT_DEATH_MESSAGES "\n";
         properties_file_output.close();
         // Re-Open File
         properties_file = std::ifstream(file);