diff --git a/src/jconf.c b/src/jconf.c
index 493d1324..d92f7dc8 100644
--- a/src/jconf.c
+++ b/src/jconf.c
@@ -160,7 +160,7 @@ jconf_t *read_jconf(const char* file)
             }
             else if (strcmp(name, "fast_open") == 0)
             {
-                conf.fast_open = 1;
+                conf.fast_open = value->u.boolean;
             }
         }
     }
diff --git a/src/server.c b/src/server.c
index a5c85021..0ef3e92f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1012,6 +1012,9 @@ int main (int argc, char **argv)
         if (password == NULL) password = conf->password;
         if (method == NULL) method = conf->method;
         if (timeout == NULL) timeout = conf->timeout;
+#ifdef TCP_FASTOPEN
+        if (fast_open == 0) fast_open = conf->fast_open;
+#endif
     }
 
     if (server_num == 0 || server_port == NULL || password == NULL)