diff --git a/src/config/WallpaperMatcher.cpp b/src/config/WallpaperMatcher.cpp
index e0dd982..e93c4ec 100644
--- a/src/config/WallpaperMatcher.cpp
+++ b/src/config/WallpaperMatcher.cpp
@@ -21,6 +21,7 @@ void CWallpaperMatcher::registerOutput(const std::string_view& s) {
 
 void CWallpaperMatcher::unregisterOutput(const std::string_view& s) {
     std::erase(m_monitorNames, s);
+    std::erase_if(m_monitorStates, [&s](const auto& e) { return e.name == s; });
     recalcStates();
 }
 
diff --git a/src/ui/UI.cpp b/src/ui/UI.cpp
index dc6ba9a..7aea9b6 100644
--- a/src/ui/UI.cpp
+++ b/src/ui/UI.cpp
@@ -36,7 +36,7 @@ CWallpaperTarget::CWallpaperTarget(SP<Hyprtoolkit::IOutput> output, const std::s
                   ->path(std::string{path})
                   ->size({Hyprtoolkit::CDynamicSize::HT_SIZE_PERCENT, Hyprtoolkit::CDynamicSize::HT_SIZE_PERCENT, {1.F, 1.F}})
                   ->sync(true)
-                  ->fitMode(Hyprtoolkit::IMAGE_FIT_MODE_COVER)
+                  ->fitMode(fitMode)
                   ->commence();
 
     m_image->setPositionMode(Hyprtoolkit::IElement::HT_POSITION_ABSOLUTE);