diff --git a/changelog/next.md b/changelog/next.md
index 3969d55..cceb79e 100644
--- a/changelog/next.md
+++ b/changelog/next.md
@@ -48,6 +48,7 @@ set shell id.
 - Fixed volumes not initializing if a pipewire device was already loaded before its node.
 - Fixed hyprland active toplevel not resetting after window closes.
 - Fixed hyprland ipc window names and titles being reversed.
+- Fixed a hyprland ipc crash when refreshing toplevels before workspaces.
 - Fixed missing signals for system tray item title and description updates.
 - Fixed asynchronous loaders not working after reload.
 - Fixed asynchronous loaders not working before window creation.
diff --git a/src/wayland/hyprland/ipc/connection.cpp b/src/wayland/hyprland/ipc/connection.cpp
index d2d5105..d15701d 100644
--- a/src/wayland/hyprland/ipc/connection.cpp
+++ b/src/wayland/hyprland/ipc/connection.cpp
@@ -729,7 +729,7 @@ void HyprlandIpc::refreshToplevels() {
 			}
 
 			auto* workspace = toplevel->bindableWorkspace().value();
-			workspace->insertToplevel(toplevel);
+			if (workspace) workspace->insertToplevel(toplevel);
 		}
 	});
 }
diff --git a/src/wayland/hyprland/ipc/hyprland_toplevel.cpp b/src/wayland/hyprland/ipc/hyprland_toplevel.cpp
index 7b07bc8..43b9838 100644
--- a/src/wayland/hyprland/ipc/hyprland_toplevel.cpp
+++ b/src/wayland/hyprland/ipc/hyprland_toplevel.cpp
@@ -72,20 +72,16 @@ void HyprlandToplevel::updateFromObject(const QVariantMap& object) {
 	Qt::beginPropertyUpdateGroup();
 	bool ok = false;
 	auto address = addressStr.toULongLong(&ok, 16);
-	if (!ok || !address) {
-		return;
-	}
+	if (ok && address) this->setAddress(address);
 
-	this->setAddress(address);
 	this->bTitle = title;
 
 	auto workspaceMap = object.value("workspace").toMap();
 	auto workspaceName = workspaceMap.value("name").toString();
 
-	auto* workspace = this->ipc->findWorkspaceByName(workspaceName, false);
-	if (!workspace) return;
+	auto* workspace = this->ipc->findWorkspaceByName(workspaceName, true);
+	if (workspace) this->setWorkspace(workspace);
 
-	this->setWorkspace(workspace);
 	this->bLastIpcObject = object;
 	Qt::endPropertyUpdateGroup();
 }