diff --git a/cluster/engine.go b/cluster/engine.go
index 06dde5ab90..47cfef4e2b 100644
--- a/cluster/engine.go
+++ b/cluster/engine.go
@@ -578,6 +578,5 @@ func (e *Engine) RenameContainer(container *Container, newName string) error {
 	}
 
 	// refresh container
-	err = e.refreshContainer(container.Id, true)
-	return err
+	return e.refreshContainer(container.Id, true)
 }
diff --git a/cluster/swarm/cluster.go b/cluster/swarm/cluster.go
index a5a3cf2cbf..33431eb8e9 100644
--- a/cluster/swarm/cluster.go
+++ b/cluster/swarm/cluster.go
@@ -408,6 +408,5 @@ func (c *Cluster) RenameContainer(container *cluster.Container, newName string)
 		return err
 	}
 	st.Name = newName
-	err = c.store.Replace(container.Id, st)
-	return err
+	return c.store.Replace(container.Id, st)
 }