diff --git a/src/psm/Util/Server/UpdateManager.php b/src/psm/Util/Server/UpdateManager.php
index 91e11822..b1c19955 100644
--- a/src/psm/Util/Server/UpdateManager.php
+++ b/src/psm/Util/Server/UpdateManager.php
@@ -71,11 +71,11 @@ class UpdateManager extends ContainerAware {
 			$status_new = $updater->update($server['server_id']);
 			// notify the nerds if applicable
 			$notifier->notify($server['server_id'], $status_old, $status_new);
-		}
 
-		// clean-up time!! archive all records
-		$archive = new ArchiveManager($this->container->get('db'));
-		$archive->archive();
-		$archive->cleanup();
+		   // clean-up time!! archive all records
+		   $archive = new ArchiveManager($this->container->get('db'));
+		   $archive->archive($server['server_id']);
+		   $archive->cleanup($server['server_id']);
+		}
 	}
 }