diff --git a/src/lib/calculator/Calculator.svelte b/src/lib/calculator/Calculator.svelte
index 22eb808..329b30a 100644
--- a/src/lib/calculator/Calculator.svelte
+++ b/src/lib/calculator/Calculator.svelte
@@ -214,6 +214,23 @@
         </section>
     {/if}
 
+    {#if commissions.length == 0}
+        <section class="bg-slate-800 rounded-lg shadow-lg p-5 flex justify-between items-center w-full gap-5">
+            <div class="flex flex-col">
+                <p class="text-green-500 font-bold text-xl">It's alone here :'(</p>
+                <p>You currently have no commissions selected. Add one --></p>
+            </div>
+            <span><Button on:click={createNew}>➕ Add Commission</Button></span>
+        </section>
+    {/if}
+
+    {#if commissions.length > 10}
+        <section class="bg-slate-800 rounded-lg shadow-lg p-5 flex items-end w-full gap-5">
+            <p><span class="text-green-500 font-bold text-xl">Calm down Elon Musk!</span>
+            Your list is becoming quite long. Loading and saving long lists is not supported and may cause considerable lag or result in loss of data.</p>
+        </section>
+    {/if}
+
     {#each [...commissions].reverse() as commission}
         <section class="flex gap-5">
             <div class="w-3/5">