diff --git a/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua b/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua
index 18d5bb6..22376a8 100644
--- a/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua
+++ b/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua
@@ -45,5 +45,5 @@ end
 function spraylist.GetSprays()
     local queryResults = sql.Query("SELECT url, name FROM spraymesh_extended_spray_list ORDER BY name DESC")
 
-    return queryResults
+    return queryResults or {}
 end
diff --git a/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua b/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua
index 96acd9d..82cd3b6 100644
--- a/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua
+++ b/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua
@@ -154,11 +154,14 @@ function PANEL:Init()
     self.IconLayout:SetSpaceY(sprayLayoutSpace)
 
     -- Load saved sprays
-    for _, savedSprayData in ipairs(spraylist.GetSprays()) do
-        local url = savedSprayData.url
-        local name = savedSprayData.name
+    local savedSprays = spraylist.GetSprays()
+    if savedSprays and #savedSprays > 0 then
+        for _, savedSprayData in ipairs(savedSprays) do
+            local url = savedSprayData.url
+            local name = savedSprayData.name
 
-        self:AddSpray(url, name)
+            self:AddSpray(url, name)
+        end
     end
 
     --