diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 7504c0d18..e2582070b 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -14,7 +14,7 @@
  - fix: packages don't take on new pages style when deployed
  - fix: Payment in commerce system (Part II)
  - fix: viewIndividualSurvey shows "Answer" lines in Survey mode
-
+ - fix: Attachment label but no field in CS posts
 
 6.99.4
  - fix: better checking of selected template type
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 775fe1090..504a3a9a6 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -1079,12 +1079,13 @@ sub www_edit {
 	$var{'form.preview'} = WebGUI::Form::submit($self->session, {
 		value=>$i18n->get("preview","Asset_Collaboration")
 		});
+	my $numberOfAttachments = $self->getThread->getParent->getValue("attachmentsPerPost");
 	$var{'attachment.form'} = WebGUI::Form::image($self->session, {
 		name=>"storageId",
 		value=>$self->get("storageId"),
-		maxAttachments=>$self->getThread->getParent->getValue("attachmentsPerPost"),
+		maxAttachments=>$numberOfAttachments,
 		deleteFileUrl=>$self->getUrl("func=deleteFile;filename=")
-		});
+		}) if ($numberOfAttachments);
         $var{'contentType.form'} = WebGUI::Form::contentType($self->session, {
                 name=>'contentType',
                 value=>$self->getValue("contentType") || "mixed"