diff --git a/quill-sql/src/main/scala/io/getquill/context/QueryExecution.scala b/quill-sql/src/main/scala/io/getquill/context/QueryExecution.scala
index f97d8f14..681ffa75 100644
--- a/quill-sql/src/main/scala/io/getquill/context/QueryExecution.scala
+++ b/quill-sql/src/main/scala/io/getquill/context/QueryExecution.scala
@@ -595,11 +595,12 @@ object PrepareDynamicExecution {
         case NotFound(uid)           => s"NotFoundPlanter($uid)"
       }
     }
-
     val sortedEncodeables =
       uidsOfScalarTags
         .map { uid =>
           encodeablesMap.get(uid) match {
+            case Some(head::Nil) =>
+              UidStatus.Primary(uid, head)
             case Some(head::tails) =>
               encodeablesMap += (uid, tails)
               UidStatus.Primary(uid, head)