diff --git a/src/format.c b/src/format.c
index 93df48ed34570964701d1bfb392f1aa0d33413d4..ce3885d575f9655ef4e66b023f52bb7e6fddf7bd 100644
--- a/src/format.c
+++ b/src/format.c
@@ -112,11 +112,11 @@ void format_send_general_headers(format_plugin_t *format,
                     "%s: %s\r\n", var->name, var->value);
             if(bytes > 0) client->con->sent_bytes += bytes;
 		}
-        bytes = sock_write(client->con->sock,
-                "Server: %s\r\n", ICECAST_VERSION_STRING);
-        if(bytes > 0) client->con->sent_bytes += bytes;
 		node = avl_get_next(node);
 	}
 	avl_tree_unlock(source->parser->vars);
+    bytes = sock_write(client->con->sock,
+            "Server: %s\r\n", ICECAST_VERSION_STRING);
+    if(bytes > 0) client->con->sent_bytes += bytes;
 }