diff --git a/bob/learn/pytorch/architectures/ConvAutoencoder.py b/bob/learn/pytorch/architectures/ConvAutoencoder.py
index a4d4bd6f6897a07f468dedfeb34b66be43fcf97c..5b8a01cf37d7b984c91ca841c96d414dc1d75343 100644
--- a/bob/learn/pytorch/architectures/ConvAutoencoder.py
+++ b/bob/learn/pytorch/architectures/ConvAutoencoder.py
@@ -57,10 +57,11 @@ class ConvAutoencoder(nn.Module):
         The forward method.
         """
         x = self.encoder(x)
-        x = self.decoder(x)
 
         if self.return_latent_embedding:
-            return self.encoder(x)
+            return x
+
+        x = self.decoder(x)
 
         return x