diff --git a/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterBaseRowViewModel.cs b/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterBaseRowViewModel.cs
index a2f435e6..3790dfd0 100644
--- a/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterBaseRowViewModel.cs
+++ b/COMETwebapp/ViewModels/Components/ParameterEditor/ParameterBaseRowViewModel.cs
@@ -127,17 +127,14 @@ private void CalculateParameterGroupData()
                 var group = this.Parameter.Group;
                 parameterGroupPath = this.Parameter.Group.Name;
 
-                while (true)
+                while (group != null)
                 {
                     if (group.ContainingGroup != null)
                     {
                         parameterGroupPath = $"{group.ContainingGroup.Name} => {parameterGroupPath}";
-                        group = group.ContainingGroup;
-                    }
-                    else
-                    {
-                        break;
                     }
+
+                    group = group.ContainingGroup;
                 }
             }