diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 260de458a7..86b3240197 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -664,10 +664,7 @@ void
 Desktop::StoreWorkspaceConfiguration(int32 index)
 {
 	// store settings
-	const BMessage *oldSettings = fSettings->WorkspacesMessage(index);
 	BMessage settings;
-	if (oldSettings)
-		settings = *oldSettings;
 	fWorkspaces[index].StoreConfiguration(settings);
 	fSettings->SetWorkspacesMessage(index, settings);
 	fSettings->Save(kWorkspacesSettings);
diff --git a/src/servers/app/Workspace.cpp b/src/servers/app/Workspace.cpp
index 87e43642f1..c67e9ef1fc 100644
--- a/src/servers/app/Workspace.cpp
+++ b/src/servers/app/Workspace.cpp
@@ -53,6 +53,9 @@ Workspace::Private::RestoreConfiguration(const BMessage& settings)
 }
 
 
+/*!
+        \brief Store the workspace configuration in an empty message
+*/
 void
 Workspace::Private::StoreConfiguration(BMessage& settings)
 {