diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index b076937e859..bc572bc9036 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -388,7 +388,11 @@ static int dir_fixups(request_rec *r)
 {
     if (r->finfo.filetype == APR_DIR) {
         /* serve up a directory */
-        return fixup_dir(r);
+        if (fixup_dir(r) != OK) {
+            return fixup_dflt(r);
+        } else {
+            return OK;
+        }
     }
     else if ((r->finfo.filetype == APR_NOFILE) && (r->handler == NULL)) {
         /* No handler and nothing in the filesystem - use fallback */