diff --git a/apps/zotonic_mod_base/src/mod_base.erl b/apps/zotonic_mod_base/src/mod_base.erl
index 45549c5ec9..35eb00203f 100644
--- a/apps/zotonic_mod_base/src/mod_base.erl
+++ b/apps/zotonic_mod_base/src/mod_base.erl
@@ -98,33 +98,36 @@ observe_dispatch(#dispatch{path=Path}, Context) ->
                     mod=controller_redirect,
                     mod_opts=[{id, Id}, {is_permanent, true}]}};
         {error, _} ->
-            Last = last(Path),
+            SlashPath = case Path of
+                <<>> -> <<"/">>;
+                <<"/", _/binary>> -> Path;
+                _ -> <<"/", Path/binary>>
+            end,
+            Last = last(SlashPath),
             Template= case Last of
-                         $/ -> <<"static/", Path/binary, "index.tpl">>;
-                         _ -> <<"static/", Path/binary, ".tpl">>
+                         $/ -> <<"static", SlashPath/binary, "index.tpl">>;
+                         _ -> <<"static", SlashPath/binary, ".tpl">>
                       end,
             case z_module_indexer:find(template, Template, Context) of
                 {ok, _} ->
                     {ok, #dispatch_match{
                         mod=controller_template,
                         mod_opts=[{template, Template}, {ssl, any}],
-                        bindings=[{path, Path}, {is_static, true}]
+                        bindings=[{path, SlashPath}, {is_static, true}]
                     }};
                 {error, _} ->
                     % Check again, assuming the path is a directory (without trailing $/)
                     case Last of
-                        $/ ->
-                            undefined;
-                        $. ->
-                            undefined;
+                        $/ -> undefined;
+                        $. -> undefined;
                         _ ->
-                            Template1 = <<"static/", Path/binary, "/index.tpl">>,
+                            Template1 = <<"static", SlashPath/binary, "/index.tpl">>,
                             case z_module_indexer:find(template, Template1, Context) of
                                 {ok, _} ->
                                     {ok, #dispatch_match{
                                         mod=controller_template,
                                         mod_opts=[{template, Template1}, {ssl, any}],
-                                        bindings=[{path, Path}, {is_static, true}]
+                                        bindings=[{path, SlashPath}, {is_static, true}]
                                     }};
                                 {error, _} ->
                                     undefined