diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 4d54406d..ad36a15d 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -262,8 +262,8 @@ void CConfigManager::parseLine(std::string& line) {
     } else if (COMMAND == "exec-once") {
         if (isFirstLaunch) {
             handleRawExec(COMMAND, VALUE);
-            return;
         }
+        return;
     } else if (COMMAND == "monitor") {
         handleMonitor(COMMAND, VALUE);
         return;
diff --git a/src/hyprerror/HyprError.cpp b/src/hyprerror/HyprError.cpp
index 524fce2d..a7563c9d 100644
--- a/src/hyprerror/HyprError.cpp
+++ b/src/hyprerror/HyprError.cpp
@@ -78,7 +78,7 @@ void CHyprError::createQueued() {
 }
 
 void CHyprError::draw() {
-    if (!m_bIsCreated) {
+    if (!m_bIsCreated || m_szQueued != "") {
         if (m_szQueued != "")
             createQueued();
         return;
@@ -88,6 +88,7 @@ void CHyprError::draw() {
         m_bQueuedDestroy = false;
         m_tTexture.destroyTexture();
         m_bIsCreated = false;
+        m_szQueued = "";
         return;
     }