diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java
index 10d5ec33f..4c5a10ef3 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java
@@ -100,7 +100,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
 
     private boolean readOnly;
 
-    private final ArtifactManagement artifactManagement;
+    private final transient ArtifactManagement artifactManagement;
 
     public ArtifactDetailsLayout(final I18N i18n, final UIEventBus eventBus,
             final ArtifactUploadState artifactUploadState, final UINotification uINotification,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
index 22d74e617..e56535224 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
@@ -126,8 +126,8 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
                 tagManagement, entityFactory, uiNotification, distFilterParameters, distributionSetManagement,
                 managementViewAcceptCriteria);
         this.distributionTableLayoutNew = new DistributionTableLayout(i18n, eventBus, permChecker, managementUIState,
-                distributionSetManagement, managementViewAcceptCriteria, entityFactory, uiNotification,
-                systemManagement, tagManagement, targetManagement);
+                distributionSetManagement, managementViewAcceptCriteria, entityFactory, uiNotification, tagManagement,
+                targetManagement);
         this.deleteAndActionsLayout = new DeleteActionsLayout(i18n, permChecker, eventBus, uiNotification,
                 tagManagement, managementViewAcceptCriteria, managementUIState, targetManagement, targetTable,
                 deploymentManagement, distributionSetManagement);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
index abee73f2d..0d7088012 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.ui.management.dstable;
 import org.eclipse.hawkbit.repository.DistributionSetManagement;
 import org.eclipse.hawkbit.repository.EntityFactory;
 import org.eclipse.hawkbit.repository.SpPermissionChecker;
-import org.eclipse.hawkbit.repository.SystemManagement;
 import org.eclipse.hawkbit.repository.TagManagement;
 import org.eclipse.hawkbit.repository.TargetManagement;
 import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout;
@@ -33,8 +32,8 @@ public class DistributionTableLayout extends AbstractTableLayout {
             final SpPermissionChecker permissionChecker, final ManagementUIState managementUIState,
             final DistributionSetManagement distributionSetManagement,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria, final EntityFactory entityFactory,
-            final UINotification notification, final SystemManagement systemManagement,
-            final TagManagement tagManagement, final TargetManagement targetService) {
+            final UINotification notification, final TagManagement tagManagement,
+            final TargetManagement targetService) {
 
         final DsMetadataPopupLayout dsMetadataPopupLayout = new DsMetadataPopupLayout(i18n, notification, eventBus,
                 distributionSetManagement, entityFactory, permissionChecker);