diff --git a/Persephone/Models/Preferences.swift b/Persephone/Models/Preferences.swift
index 6113314..7666d90 100644
--- a/Persephone/Models/Preferences.swift
+++ b/Persephone/Models/Preferences.swift
@@ -23,7 +23,11 @@ struct Preferences {
       return UserDefaults.standard.value(forKey: "mpdPort") as? Int
     }
     set {
-      UserDefaults.standard.set(newValue, forKey: "mpdPort")
+      if (newValue.map { $0 > 0 } ?? false) {
+        UserDefaults.standard.set(newValue, forKey: "mpdPort")
+      } else {
+        UserDefaults.standard.removeObject(forKey: "mpdPort")
+      }
     }
   }