diff --git a/plugins/out_logdna/logdna.c b/plugins/out_logdna/logdna.c
index 4ea05392ac7..e3ab9f56fa9 100644
--- a/plugins/out_logdna/logdna.c
+++ b/plugins/out_logdna/logdna.c
@@ -310,15 +310,17 @@ static struct flb_logdna *logdna_config_create(struct flb_output_instance *ins,
         else {
             ctx->_hostname = flb_sds_create("unknown");
         }
-        if (!ctx->_hostname) {
-            flb_free(ctx);
-            return NULL;
-        }
     }
     else {
         ctx->_hostname = flb_sds_create(ctx->hostname);
     }
 
+    /* Bail if unsuccessful hostname creation */
+    if (!ctx->_hostname) {
+        flb_free(ctx);
+        return NULL;
+    }
+
     /* Create Upstream connection context */
     upstream = flb_upstream_create(config,
                                    ctx->logdna_host,