diff --git a/lib/beautiful/init.lua b/lib/beautiful/init.lua
index ddd9ef325..f37aefd70 100644
--- a/lib/beautiful/init.lua
+++ b/lib/beautiful/init.lua
@@ -194,9 +194,10 @@ function beautiful.init(config)
             -- Expand the '~' $HOME shortcut
             config = config:gsub("^~/", homedir .. "/")
             local dir = Gio.File.new_for_path(config):get_parent()
-            beautiful.theme_path = dir and (dir:get_path().."/") or nil
+            rawset(beautiful, "theme_path", dir and (dir:get_path().."/") or nil)
             theme = protected_call(dofile, config)
         elseif type(config) == 'table' then
+            rawset(beautiful, "theme_path", nil)
             theme = config
         end