diff --git a/include/diaspora.php b/include/diaspora.php
index db6844f44d..10f1be93d2 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2876,8 +2876,10 @@ class diaspora {
 					"created_at" => $created,
 					"provider_display_name" => $item["app"]);
 
-			if (count($location) == 0)
+			// Diaspora rejects messages when they contain a location without "lat" or "lng"
+			if (!isset($location["lat"]) OR !isset($location["lng"])) {
 				unset($message["location"]);
+			}
 
 			$type = "status_message";
 		}