diff --git a/exporters/geneva/src/exporter.cc b/exporters/geneva/src/exporter.cc
index 6fb59d7c0..f9303e221 100644
--- a/exporters/geneva/src/exporter.cc
+++ b/exporters/geneva/src/exporter.cc
@@ -42,7 +42,6 @@ Exporter::Exporter(const ExporterOptions &options)
   auto status = data_transport_->Connect();
   if (!status) {
     LOG_ERROR("[Geneva Exporter] Connect failed. No data would be sent.");
-    is_shutdown_ = true;
     return;
   }
 }
diff --git a/exporters/geneva/src/socket_data_transport.cc b/exporters/geneva/src/socket_data_transport.cc
index 377be6fa8..000969950 100644
--- a/exporters/geneva/src/socket_data_transport.cc
+++ b/exporters/geneva/src/socket_data_transport.cc
@@ -58,7 +58,7 @@ bool SocketDataTransport::Send(MetricsEventType event_type,
           "Geneva Exporter: UDS::Send Socket reconnect failed. Send failed");
     }
   }
-  if (error_code != 0) {
+  if (!connected_ || error_code != 0 ) {
     LOG_ERROR("Geneva Exporter: UDS::Send failed - not connected");
     connected_ = false;
     return false;