diff --git a/ciao-controller/compute.go b/ciao-controller/compute.go
index baf0cbee2..423128102 100644
--- a/ciao-controller/compute.go
+++ b/ciao-controller/compute.go
@@ -449,6 +449,12 @@ func instanceToServer(context *controller, instance *types.Instance) (payloads.S
 		SSHPort: instance.SSHPort,
 	}
 
+	// OpenStack compatibility: expected status for a running
+	// instance is 'active and not 'running'.
+	if server.Status == "running" {
+		server.Status = "active"
+	}
+
 	return server, nil
 }
 
@@ -498,11 +504,6 @@ func showServerDetails(w http.ResponseWriter, r *http.Request, context *controll
 		return
 	}
 
-	// OpenStack compatibility: expect active status not running for API Call
-	if server.Server.Status == "running" {
-		server.Server.Status = "active"
-	}
-
 	b, err := json.Marshal(server)
 	if err != nil {
 		returnErrorCode(w, http.StatusInternalServerError, err.Error())