diff --git a/Moonlight/App/Helpers/Formatter.cs b/Moonlight/App/Helpers/Formatter.cs
index 99a8ab62..929a7bb9 100644
--- a/Moonlight/App/Helpers/Formatter.cs
+++ b/Moonlight/App/Helpers/Formatter.cs
@@ -116,4 +116,12 @@ public static class Formatter
             return (i / (1024D * 1024D)).Round(2) + " GB";
         }
     }
+    
+    public static double BytesToGb(long bytes)
+    {
+        const double gbMultiplier = 1024 * 1024 * 1024; // 1 GB = 1024 MB * 1024 KB * 1024 B
+
+        double gigabytes = (double)bytes / gbMultiplier;
+        return gigabytes;
+    }
 }
\ No newline at end of file
diff --git a/Moonlight/App/Services/Background/CleanupService.cs b/Moonlight/App/Services/Background/CleanupService.cs
index 1a3d2da0..0a99bea6 100644
--- a/Moonlight/App/Services/Background/CleanupService.cs
+++ b/Moonlight/App/Services/Background/CleanupService.cs
@@ -5,6 +5,7 @@ using Moonlight.App.ApiClients.Daemon.Resources;
 using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Helpers;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
 using Newtonsoft.Json;
@@ -84,7 +85,7 @@ public class CleanupService
                     var cpuMetrics = await nodeService.GetCpuMetrics(node);
                     var memoryMetrics = await nodeService.GetMemoryMetrics(node);
 
-                    if (cpuMetrics.CpuUsage > maxCpu || (memoryMetrics.Total - memoryMetrics.Used) < minMemory)
+                    if (cpuMetrics.CpuUsage > maxCpu || (Formatter.BytesToGb(memoryMetrics.Total) - (Formatter.BytesToGb(memoryMetrics.Used))) < minMemory)
                     {
                         var dockerMetrics = await nodeService.GetDockerMetrics(node);
 
diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor
index 2ccf3245..d4c59945 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/View.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor
@@ -87,7 +87,7 @@ else
                         else
                         {
                             <span>
-                                @(Formatter.FormatSize(MemoryMetrics.Used * 1024D * 1024D)) <TL>of</TL> @(Formatter.FormatSize(MemoryMetrics.Total * 1024D * 1024D)) <TL>used</TL>
+                                @(Formatter.FormatSize(MemoryMetrics.Used)) <TL>of</TL> @(Formatter.FormatSize(MemoryMetrics.Total)) <TL>memory used</TL>
                             </span>
                         }
                     </span>