diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js
index cc3162b90..3f898bfb3 100644
--- a/openslides/agenda/static/js/agenda/site.js
+++ b/openslides/agenda/static/js/agenda/site.js
@@ -156,6 +156,14 @@ angular.module('OpenSlidesApp.agenda.site', [
             }
         };
 
+        $scope.getUpdateStatePrefix = function (item) {
+            var prefix = item.content_object.collection.replace('/','.');
+            // Hotfix for Issue 2566.
+            // The changes could be reverted if Issue 2480 is closed.
+            prefix = prefix.replace('motion-block', 'motionBlock');
+            return prefix;
+        };
+
         // pagination
         $scope.currentPage = 1;
         $scope.itemsPerPage = 100;
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index e6d61586d..5404f5991 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -220,7 +220,7 @@
           <div os-perms="agenda.can_see" class="hoverActions" ng-class="{'hiddenDiv': !item.hover}">
             <a ui-sref="agenda.item.detail({id: item.id})" translate>List of speakers</a>
             <span os-perms="agenda.can_manage"> |
-              <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
+              <a ui-sref="{{ getUpdateStatePrefix(item) }}.detail.update({id: item.content_object.id})"
                   translate>Edit</a> |
               <a href="" ng-click="item.quickEdit=true" translate>QuickEdit</a> |
               <a href="" class="text-danger"
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index 3648392d8..d28c4fd02 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -259,7 +259,7 @@ angular.module('OpenSlidesApp.motions.site', [
                             closeByDocument: false,
                             resolve: {
                                 motionBlock: function () {
-                                    return motionBlock;
+                                    return MotionBlock.find($stateParams.id);
                                 }
                             },
                             preCloseCallback: function() {