diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
index <HASH>..<HASH> 100644
--- a/lib/Elastica/Client.php
+++ b/lib/Elastica/Client.php
@@ -408,16 +408,23 @@ class Client
      */
     public function getConnection()
     {
-        if ($this->_config['roundRobin'] === true) {
+        $enabledConnection = null;
+        
+        if (($this->_config['roundRobin'] === true) && (count($this->_connections) > 1)) {
             shuffle($this->_connections);
         }
+        
         foreach ($this->_connections as $connection) {
             if ($connection->isEnabled()) {
-                return $connection;
+                $enabledConnection = $connection;
             }
         }
-        // No connection is enabled. Throw an error.
-        throw new ClientException('No enabled connection');
+        
+        if (empty($enabledConnection)) {
+            throw new ClientException('No enabled connection');
+        }
+
+        return $enabledConnection;
     }
 
     /**
Return is now at back of the function again. Also added a check to not shuffle if only one connection in available.