diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java
index 85020774e..163fea86b 100644
--- a/src/org/thoughtcrime/securesms/map/MapActivity.java
+++ b/src/org/thoughtcrime/securesms/map/MapActivity.java
@@ -306,7 +306,7 @@ public class MapActivity extends BaseActivity implements Observer,
     }
 
     private boolean handleAddPoiClick(LatLng point) {
-        if (chatId == 0) {
+        if (chatId == 0 || !DcHelper.getContext(this).getChat(chatId).canSend()) {
             return false;
         }