diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor
index 1ce2a070a..a53341f91 100644
--- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor
+++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor
@@ -3,7 +3,6 @@
 @using TeslaSolarCharger.Shared.Dtos.BaseConfiguration
 @using TeslaSolarCharger.Shared
 @using TeslaSolarCharger.Shared.Enums
-@using Majorsoft.Blazor.Components.Collapse
 @using TeslaSolarCharger.Shared.Dtos
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
diff --git a/TeslaSolarCharger/Client/Pages/Index.razor b/TeslaSolarCharger/Client/Pages/Index.razor
index 18ad17cc8..6fad3948c 100644
--- a/TeslaSolarCharger/Client/Pages/Index.razor
+++ b/TeslaSolarCharger/Client/Pages/Index.razor
@@ -7,7 +7,6 @@
 @using TeslaSolarCharger.Shared.Dtos.IndexRazor.PvValues
 @using TeslaSolarCharger.Shared.Enums
 @using TeslaSolarCharger.Shared.Resources
-@using Majorsoft.Blazor.Components.Collapse
 @using TeslaSolarCharger.Shared.Dtos.Settings
 @using TeslaSolarCharger.Shared.Dtos.Table
 @using System.Diagnostics
@@ -363,35 +362,15 @@ else
                 </p>
 
             }
-
-            <CollapsePanel CollapsedColor="@_collapsedColor"
-                           ExpandedColor="@_expandedColor"
-                           HoverColor="@_hoverColor"
-                           Disabled="@_isCollapseDisabled"
-                           Collapsed="@_collapsedCarDetails.Any(h => h == car.CarId)"
-                           ContentHeight="@_height"
-                           Animate="@_isAnimated"
-                           ShowContentOverflow="@_showOverflow"
-                           OnCollapseChanged="(state) => OnCollapseChanged(state, car.CarId)">
-                <CollapsedHeaderContent>
-                    <div class="w-100">
-                        <b>More car details:</b>
-                        <span class="fa fa-lg fa-chevron-circle-down" aria-hidden="true"></span>
-                    </div>
-                </CollapsedHeaderContent>
-                <ExpandedHeaderContent>
-                    <div class="w-100">
-                        <b>Collapse</b>
-                        <span class="fa fa-lg fa-chevron-circle-up" aria-hidden="true"></span>
-                    </div>
-                </ExpandedHeaderContent>
-                <Content>
+            
+            <MudExpansionPanels>
+                <MudExpansionPanel Text="More car details:" IsExpandedChanged="(state) => OnCollapseChanged(state, car.CarId)">
                     @if (_newCarDetailStates.Any(c => c.Key == car.CarId))
                     {
                         <TableComponent Content="@_newCarDetailStates[car.CarId]"></TableComponent>
                     }
-                </Content>
-            </CollapsePanel>
+                </MudExpansionPanel>
+            </MudExpansionPanels>
         </div>
     }
     <div class="shadow p-3 mb-5 bg-white rounded">
@@ -615,16 +594,16 @@ else
         _serverTimeZoneDisplayName = dtoServerTimeZoneId?.Value;
     }
 
-    private async Task OnCollapseChanged(bool changedToCollapse, int carId)
+    private async Task OnCollapseChanged(bool changedToExpanded, int carId)
     {
-        if (changedToCollapse)
+        if (changedToExpanded)
         {
-            _collapsedCarDetails.Add(carId);
+            _collapsedCarDetails.Remove(carId);
+            _newCarDetailStates.Remove(carId);
         }
         else
         {
-            _collapsedCarDetails.Remove(carId);
-            _newCarDetailStates.Remove(carId);
+            _collapsedCarDetails.Add(carId);
         }
         await RefreshAllVisableCarDetails().ConfigureAwait(false);
     }
diff --git a/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj b/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj
index 713b3ecb0..f56101854 100644
--- a/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj
+++ b/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Majorsoft.Blazor.Components.Collapse" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="MudBlazor" Version="6.11.2" />