diff --git a/modules/metaedit/www/edit.php b/modules/metaedit/www/edit.php
index 5beb272af3d3e7d62d9b8fe874ea90e6c2c58c88..f8f47917a4a53115dbf700b33c560c4c64fb0706 100644
--- a/modules/metaedit/www/edit.php
+++ b/modules/metaedit/www/edit.php
@@ -39,6 +39,10 @@ if (array_key_exists('entityid', $_REQUEST)) {
 	$entity = array_pop($entities);
 	$metadata =  $entity->getMetadata20SP();
 
+	/* Trim metadata endpoint arrays. */
+	$metadata['AssertionConsumerService'] = SimpleSAML_Utilities::getDefaultEndpoint($metadata['AssertionConsumerService'], array(SAML2_Const::BINDING_HTTP_POST));
+	$metadata['SingleLoogutService'] = SimpleSAML_Utilities::getDefaultEndpoint($metadata['SingleLogoutService'], array(SAML2_Const::BINDING_HTTP_REDIRECT));
+
 } else {
 	$metadata = array(
 		'owner' => $userid,