diff --git a/common/src/main/java/ctbrec/sites/streamate/Streamate.java b/common/src/main/java/ctbrec/sites/streamate/Streamate.java
index d8870509..a86eb91b 100644
--- a/common/src/main/java/ctbrec/sites/streamate/Streamate.java
+++ b/common/src/main/java/ctbrec/sites/streamate/Streamate.java
@@ -193,13 +193,7 @@ public class Streamate extends AbstractSite {
         Matcher m = Pattern.compile("https?://.*?streamate.com/cam/([^/]*?)/?").matcher(url);
         if (m.matches()) {
             String modelName = m.group(1);
-            StreamateModel model = (StreamateModel) createModel(modelName);
-            try {
-                model.loadModelInfo();
-            } catch (IOException e) {
-                LOG.error("Couldn't load model info. This can cause problems with saving / loading the model");
-            }
-            return model;
+            return createModel(modelName);
         } else {
             return super.createModelFromUrl(url);
         }
diff --git a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java
index cda334bb..519bce2c 100644
--- a/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java
+++ b/common/src/main/java/ctbrec/sites/streamate/StreamateModel.java
@@ -330,6 +330,13 @@ public class StreamateModel extends AbstractModel {
 
     @Override
     public void writeSiteSpecificData(JsonWriter writer) throws IOException {
+        if(id == null) {
+            try {
+                loadModelInfo();
+            } catch (IOException e) {
+                LOG.error("Couldn't load model ID for {}. This can cause problems with saving / loading the model", getName());
+            }
+        }
         writer.name("id").value(id);
     }
 }
\ No newline at end of file