diff --git a/Code/Module/Photos.php b/Code/Module/Photos.php
index 22fd0d0a5..b3b3511e2 100644
--- a/Code/Module/Photos.php
+++ b/Code/Module/Photos.php
@@ -735,10 +735,8 @@ class Photos extends Controller
                 '$nickname' => App::$data['channel']['channel_address'],
                 '$newalbum_label' => t('Enter an album name'),
                 '$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
-                '$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
                 '$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
                 'title' => ['title', t('Title (optional)')],
-                '$body' => array('body', t('Your message (optional)'), '', 'This will only appear in the status post'),
                 '$albums' => $albums['albums'],
                 '$selname' => $selname,
                 '$permissions' => t('Permissions'),
diff --git a/include/photos.php b/include/photos.php
index 14c4d09b6..f945292ac 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -419,7 +419,7 @@ function photo_upload($channel, $observer, $args)
         $activity_format = sprintf(t('%1$s posted %2$s', 'photo_upload'), $author_link, $photo_link);
 	}
 
-    $body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
+    $body = (isset($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
 
     // If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post.
 
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 5a166af24..fa85b1abe 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -16,15 +16,9 @@
 				</datalist>
 			</div>
 			{{if $default}}
-			<!-- div class="form-group">
-				<input id="photos-upload-choose" type="file" name="userfile" />
-			</div -->
 			{{include file="field_input.tpl" field=$caption}}
 			{{include file="field_input.tpl" field=$title}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
+            <input type="hidden" name="visible" value="0" />
 			<div class="pull-right btn-group">
 				<div class="btn-group">
 					{{if $lockstate}}
@@ -42,10 +36,7 @@
 			{{if $uploader}}
 			{{include file="field_input.tpl" field=$caption}}
 			{{include file="field_input.tpl" field=$title}}
-			{{include file="field_checkbox.tpl" field=$visible}}
-			<div id="body-textarea">
-			{{include file="field_textarea.tpl" field=$body}}
-			</div>
+			<input type="hidden" name="visible" value="0" />
 			<div id="photos-upload-perms" class="btn-group pull-right">
 				{{if $lockstate}}
 				<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">