diff --git a/compilers/concrete-compiler/compiler/lib/Support/ClientParametersGeneration.cpp b/compilers/concrete-compiler/compiler/lib/Support/ClientParametersGeneration.cpp
index 5ebb4408d..885829abd 100644
--- a/compilers/concrete-compiler/compiler/lib/Support/ClientParametersGeneration.cpp
+++ b/compilers/concrete-compiler/compiler/lib/Support/ClientParametersGeneration.cpp
@@ -210,9 +210,10 @@ generateGate(mlir::Type type, encodings::Encoding encoding,
         if (auto err = scalarGate.takeError()) {
           return std::move(err);
         }
-        if (maybeCrt.has_value()) {
-          // When using crt, the last dimension of the tensor is for the members
-          // of the decomposition. It should not be used.
+        if (maybeCrt.has_value() && scalarGate->isEncrypted()) {
+          // When using crt with encrypted tensors, the last dimension of the
+          // tensor is for the members of the decomposition. It should not be
+          // used.
           scalarGate->shape.dimensions =
               tensor.getShape().take_front(tensor.getShape().size() - 1).vec();
         } else {