diff --git a/bin/cqlsh b/bin/cqlsh
index eca641b2e6..c3a4ea6e35 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -532,6 +532,10 @@ class Shell(cmd.Cmd):
         self.empty_lines = 0
         self.statement_error = False
         self.single_statement = single_statement
+        #see CASSANDRA-7399
+        type_for_composites = lambda cls: "'%s'" % cls.cass_parameterized_type_with(cls.subtypes, True)
+        cassandra.cqltypes.CompositeType.cql_parameterized_type = classmethod(type_for_composites)
+        cassandra.cqltypes.DynamicCompositeType.cql_parameterized_type = classmethod(type_for_composites)
 
     def set_expanded_cql_version(self, ver):
         ver, vertuple = full_cql_version(ver)