diff --git a/src/main/java/edu/hsh/dbs2/imdb/logic/MovieManager.java b/src/main/java/edu/hsh/dbs2/imdb/logic/MovieManager.java
index fa903042da4236d5b8a9243dffd8471ea3b8f27f..6cff03c8d44f9775f2c01eee1da21c86d56aa190 100644
--- a/src/main/java/edu/hsh/dbs2/imdb/logic/MovieManager.java
+++ b/src/main/java/edu/hsh/dbs2/imdb/logic/MovieManager.java
@@ -38,6 +38,7 @@ public class MovieManager extends Manager {
 			update(movie.get(), movieDTO);
 		else
 			insert(movieDTO);
+		closeEntityManager();
 	}
 
 	private void updateMapper() {
@@ -58,6 +59,7 @@ public class MovieManager extends Manager {
 	public void deleteMovie(final long movieId) {
 		var movie = findMovieById(movieId);
 		movie.ifPresent(this::delete);
+		closeEntityManager();
 	}
 
 	private void delete(Movie movie) {
@@ -66,11 +68,12 @@ public class MovieManager extends Manager {
 
 	public MovieDTO getMovie(final long movieId) {
 		var movie = findMovieById(movieId);
+		closeEntityManager();
 		return movie.map(mapper::map).orElse(null);
 	}
 
 	private Optional<Movie> findMovieById(final long id) {
-		return query(Movie.class, (cb, cq) -> {
+		return queryNoClose(Movie.class, (cb, cq) -> {
 			var root = cq.from(Movie.class);
 			cq.select(root).where(cb.equal(root.get("id"), id));
 		}).stream().findAny();