diff --git a/app/src/main/java/com/futo/circles/core/Constants.kt b/app/src/main/java/com/futo/circles/core/Constants.kt
index a61385c8f12ffc22631b1ed5678d3627d88e0323..72c29da7662505a96ca649f00740c73a34ea8cff 100644
--- a/app/src/main/java/com/futo/circles/core/Constants.kt
+++ b/app/src/main/java/com/futo/circles/core/Constants.kt
@@ -10,4 +10,5 @@ const val AUTH_EXCEPTION_REASON_KEY = "reason"
 const val PENDING_SESSION_PROPERTY_NAME = "pendingSessionData"
 const val CURRENT_SESSION_PROPERTY_NAME = "currentSession"
 
-const val DEFAULT_TERMS_NAME = "Terms and Conditions"
\ No newline at end of file
+const val DEFAULT_TERMS_NAME = "Terms and Conditions"
+const val TERMS_URL_EXTENSION = "_matrix/consent"
diff --git a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt b/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
index 6528ed3bc9efe6651f4a46d591e316df680d699d..1172f0ac1e7b9f26ded990bd553e9aa19491e5a5 100644
--- a/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
+++ b/app/src/main/java/com/futo/circles/feature/terms/data_source/AcceptTermsDataSource.kt
@@ -2,6 +2,9 @@ package com.futo.circles.feature.terms.data_source
 
 
 import androidx.lifecycle.MutableLiveData
+import com.futo.circles.BuildConfig
+import com.futo.circles.core.DEFAULT_TERMS_NAME
+import com.futo.circles.core.TERMS_URL_EXTENSION
 import com.futo.circles.extensions.Response
 import com.futo.circles.extensions.createResult
 import com.futo.circles.extensions.toTermsListItems
@@ -15,7 +18,7 @@ class AcceptTermsDataSource(
     private val signUpDataSource: SignUpDataSource
 ) {
 
-    val termsListLiveData = MutableLiveData<List<TermsListItem>>(getTermsList())
+    val termsListLiveData = MutableLiveData(getTermsList())
 
     private val wizard by lazy {
         MatrixInstanceProvider.matrix.authenticationService().getRegistrationWizard()
@@ -36,5 +39,12 @@ class AcceptTermsDataSource(
 
     private fun getTermsList() =
         (signUpDataSource.currentStage as? Stage.Terms)?.policies?.toTermsListItems()
+            ?.takeIf { it.isNotEmpty() }
+            ?: listOf(
+                TermsListItem(
+                    1, DEFAULT_TERMS_NAME,
+                    BuildConfig.MATRIX_HOME_SERVER_URL + TERMS_URL_EXTENSION
+                )
+            )
 
 }
\ No newline at end of file