diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index aabc8fab3..9232c2956 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -131,6 +131,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -917,7 +918,18 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onPublishClick(View v){
-		publish();
+		if (!attachments.isEmpty()
+				&& statusVisibility != StatusPrivacy.DIRECT
+				&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.sk_no_image_desc_title)
+					.setMessage(R.string.sk_no_image_desc)
+					.setNegativeButton(R.string.cancel, null)
+					.setPositiveButton(R.string.publish, (dialog, i)-> publish())
+					.show();
+		} else {
+			publish();
+		}
 	}
 
 	private void publishErrorCallback(ErrorResponse error) {
@@ -1030,6 +1042,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
+
 		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 7f0c0a906..fefd28928 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -131,4 +131,6 @@
     <string name="sk_compose_no_draft">Don’t draft</string>
     <string name="sk_settings_reduce_motion">Reduce motion in animations</string>
     <string name="sk_bot_account">This is a bot account</string>
+    <string name="sk_no_image_desc_title">No Image description</string>
+    <string name="sk_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
 </resources>
\ No newline at end of file