diff --git a/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt b/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt
index 28eaacf..dd573c6 100644
--- a/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt
+++ b/data/src/main/java/com/foke/together/data/datasource/local/datastore/AppPreferencesSerializer.kt
@@ -3,6 +3,7 @@ package com.foke.together.data.datasource.local.datastore
 import androidx.datastore.core.Serializer
 import com.foke.together.AppPreferences
 import com.foke.together.util.AppLog
+import com.foke.together.util.AppPolicy
 import java.io.InputStream
 import java.io.OutputStream
 import javax.inject.Inject
@@ -14,6 +15,7 @@ class AppPreferencesSerializer @Inject constructor(): Serializer<AppPreferences>
             // You need to check default value of each types from link below
             // https://protobuf.dev/programming-guides/proto3/
             // ex> isDebugMode = true
+            externalCameraIp = AppPolicy.DEFAULT_EXTERNAL_CAMERA_IP
             build()
         }
 
diff --git a/data/src/main/java/com/foke/together/data/repository/AppPreferencesRepository.kt b/data/src/main/java/com/foke/together/data/repository/AppPreferencesRepository.kt
index 19d551f..4907d7f 100644
--- a/data/src/main/java/com/foke/together/data/repository/AppPreferencesRepository.kt
+++ b/data/src/main/java/com/foke/together/data/repository/AppPreferencesRepository.kt
@@ -42,12 +42,7 @@ class AppPreferencesRepository @Inject constructor(
 
     override fun getExternalCameraIP(): Flow<ExternalCameraIP> =
         appPreferencesFlow.map {
-            val address = it.externalCameraIp
-            if (address.isNullOrEmpty()) {
-                ExternalCameraIP("0.0.0.0")
-            } else {
-                ExternalCameraIP(address)
-            }
+            ExternalCameraIP(it.externalCameraIp)
         }
 
     override suspend fun setExternalCameraIP(ip: ExternalCameraIP) {
diff --git a/util/src/main/java/com/foke/together/util/Policy.kt b/util/src/main/java/com/foke/together/util/Policy.kt
new file mode 100644
index 0000000..995c682
--- /dev/null
+++ b/util/src/main/java/com/foke/together/util/Policy.kt
@@ -0,0 +1,5 @@
+package com.foke.together.util
+
+object AppPolicy {
+    const val DEFAULT_EXTERNAL_CAMERA_IP = "0.0.0.0"
+}
\ No newline at end of file