diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/datasource/DataSource.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/datasource/DataSource.kt
index 24efc90f..b055b9c7 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/datasource/DataSource.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/datasource/DataSource.kt
@@ -21,9 +21,11 @@ abstract class DataSource(val config: DatabaseConnectionConfig) {
     abstract fun toConnectionUrl(): String
 
     fun toPortedAddress(): String {
-        return if (!config.address.contains(":") && config.port?.isBlank() != true) {
-            "$config.address:$config.port"
-        } else config.address
+        var baseAddress = config.address
+        if (!config.port.isNullOrBlank()) {
+            baseAddress += ":${config.port}"
+        }
+        return baseAddress
     }
 
     abstract fun toDatabase(): Database